Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
234f150f
Kaydet (Commit)
234f150f
authored
Nis 14, 2012
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Resolves: fdo#48640 handle various busted rtf docs without hanging
üst
18561869
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
3 deletions
+25
-3
objstor.cxx
sfx2/source/doc/objstor.cxx
+1
-1
ndtbl.cxx
sw/source/core/docnode/ndtbl.cxx
+9
-1
unotext.cxx
sw/source/core/unocore/unotext.cxx
+4
-0
DomainMapperTableManager.cxx
writerfilter/source/dmapper/DomainMapperTableManager.cxx
+1
-1
rtftokenizer.cxx
writerfilter/source/rtftok/rtftokenizer.cxx
+10
-0
No files found.
sfx2/source/doc/objstor.cxx
Dosyayı görüntüle @
234f150f
...
@@ -2236,7 +2236,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert )
...
@@ -2236,7 +2236,7 @@ sal_Bool SfxObjectShell::ImportFrom( SfxMedium& rMedium, bool bInsert )
}
}
return
xLoader
->
filter
(
aArgs
);
return
xLoader
->
filter
(
aArgs
);
}
catch
(
const
uno
::
Exception
&
)
}
catch
(
...
)
{}
{}
}
}
...
...
sw/source/core/docnode/ndtbl.cxx
Dosyayı görüntüle @
234f150f
...
@@ -1078,8 +1078,16 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
...
@@ -1078,8 +1078,16 @@ SwTableNode* SwNodes::TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
const
SwTable
*
SwDoc
::
TextToTable
(
const
std
::
vector
<
std
::
vector
<
SwNodeRange
>
>&
rTableNodes
)
const
SwTable
*
SwDoc
::
TextToTable
(
const
std
::
vector
<
std
::
vector
<
SwNodeRange
>
>&
rTableNodes
)
{
{
if
(
rTableNodes
.
empty
())
return
NULL
;
std
::
vector
<
SwNodeRange
>
rFirstRange
=
*
rTableNodes
.
begin
();
if
(
rFirstRange
.
empty
())
return
NULL
;
/* Save first node in the selection if it is a content node. */
/* Save first node in the selection if it is a content node. */
SwCntntNode
*
pSttCntntNd
=
r
TableNodes
.
begin
()
->
begin
()
->
aStart
.
GetNode
().
GetCntntNode
();
SwCntntNode
*
pSttCntntNd
=
r
FirstRange
.
begin
()
->
aStart
.
GetNode
().
GetCntntNode
();
/**debug**/
/**debug**/
#if OSL_DEBUG_LEVEL > 1
#if OSL_DEBUG_LEVEL > 1
...
...
sw/source/core/unocore/unotext.cxx
Dosyayı görüntüle @
234f150f
...
@@ -2230,6 +2230,10 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
...
@@ -2230,6 +2230,10 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
std
::
vector
<
VerticallyMergedCell
>
aMergedCells
;
std
::
vector
<
VerticallyMergedCell
>
aMergedCells
;
SwTable
const
*
const
pTable
=
m_pImpl
->
m_pDoc
->
TextToTable
(
aTableNodes
);
SwTable
const
*
const
pTable
=
m_pImpl
->
m_pDoc
->
TextToTable
(
aTableNodes
);
if
(
!
pTable
)
return
uno
::
Reference
<
text
::
XTextTable
>
();
SwXTextTable
*
const
pTextTable
=
new
SwXTextTable
(
*
pTable
->
GetFrmFmt
()
);
SwXTextTable
*
const
pTextTable
=
new
SwXTextTable
(
*
pTable
->
GetFrmFmt
()
);
const
uno
::
Reference
<
text
::
XTextTable
>
xRet
=
pTextTable
;
const
uno
::
Reference
<
text
::
XTextTable
>
xRet
=
pTextTable
;
const
uno
::
Reference
<
beans
::
XPropertySet
>
xPrSet
=
pTextTable
;
const
uno
::
Reference
<
beans
::
XPropertySet
>
xPrSet
=
pTextTable
;
...
...
writerfilter/source/dmapper/DomainMapperTableManager.cxx
Dosyayı görüntüle @
234f150f
...
@@ -442,7 +442,7 @@ void DomainMapperTableManager::endOfRowAction()
...
@@ -442,7 +442,7 @@ void DomainMapperTableManager::endOfRowAction()
double
nFullWidth
=
m_nTableWidth
;
double
nFullWidth
=
m_nTableWidth
;
//the positions have to be distibuted in a range of 10000
//the positions have to be distibuted in a range of 10000
const
double
nFullWidthRelative
=
10000.
;
const
double
nFullWidthRelative
=
10000.
;
if
(
pTableGrid
->
size
()
==
nGrids
)
if
(
pTableGrid
->
size
()
==
nGrids
&&
m_nCell
>
0
)
{
{
uno
::
Sequence
<
text
::
TableColumnSeparator
>
aSeparators
(
m_nCell
-
1
);
uno
::
Sequence
<
text
::
TableColumnSeparator
>
aSeparators
(
m_nCell
-
1
);
text
::
TableColumnSeparator
*
pSeparators
=
aSeparators
.
getArray
();
text
::
TableColumnSeparator
*
pSeparators
=
aSeparators
.
getArray
();
...
...
writerfilter/source/rtftok/rtftokenizer.cxx
Dosyayı görüntüle @
234f150f
...
@@ -213,6 +213,11 @@ int RTFTokenizer::resolveKeyword()
...
@@ -213,6 +213,11 @@ int RTFTokenizer::resolveKeyword()
{
{
aBuf
.
append
(
ch
);
aBuf
.
append
(
ch
);
Strm
()
>>
ch
;
Strm
()
>>
ch
;
if
(
Strm
().
IsEof
())
{
ch
=
' '
;
break
;
}
}
}
if
(
aBuf
.
getLength
()
>
32
)
if
(
aBuf
.
getLength
()
>
32
)
// See RTF spec v1.9.1, page 7
// See RTF spec v1.9.1, page 7
...
@@ -237,6 +242,11 @@ int RTFTokenizer::resolveKeyword()
...
@@ -237,6 +242,11 @@ int RTFTokenizer::resolveKeyword()
{
{
aParameter
.
append
(
ch
);
aParameter
.
append
(
ch
);
Strm
()
>>
ch
;
Strm
()
>>
ch
;
if
(
Strm
().
IsEof
())
{
ch
=
' '
;
break
;
}
}
}
nParam
=
aParameter
.
makeStringAndClear
().
toInt32
();
nParam
=
aParameter
.
makeStringAndClear
().
toInt32
();
if
(
bNeg
)
if
(
bNeg
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment