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
698153d9
Kaydet (Commit)
698153d9
authored
Agu 29, 2016
tarafından
Miklos Vajna
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Indentation fixes
Change-Id: I903fcd36878cd0b74757805bcbdb414feb713d7b
üst
313fe1f7
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
22 deletions
+22
-22
textboxhelper.hxx
sw/inc/textboxhelper.hxx
+1
-1
unoredline.hxx
sw/inc/unoredline.hxx
+1
-1
unoredlines.hxx
sw/inc/unoredlines.hxx
+1
-1
textboxhelper.cxx
sw/source/core/doc/textboxhelper.cxx
+18
-18
signing.cxx
xmlsecurity/qa/unit/signing/signing.cxx
+1
-1
No files found.
sw/inc/textboxhelper.hxx
Dosyayı görüntüle @
698153d9
...
...
@@ -72,7 +72,7 @@ public:
*/
static
SwFrameFormat
*
getOtherTextBoxFormat
(
const
SwFrameFormat
*
pFormat
,
sal_uInt16
nType
);
/// If we have an associated TextFrame, then return that.
static
SwFrameFormat
*
getOtherTextBoxFormat
(
css
::
uno
::
Reference
<
css
::
drawing
::
XShape
>
const
&
xShape
);
static
SwFrameFormat
*
getOtherTextBoxFormat
(
css
::
uno
::
Reference
<
css
::
drawing
::
XShape
>
const
&
xShape
);
/// Return the textbox rectangle of a draw shape (in twips).
static
Rectangle
getTextRectangle
(
SwFrameFormat
*
pShape
,
bool
bAbsolute
=
true
);
...
...
sw/inc/unoredline.hxx
Dosyayı görüntüle @
698153d9
...
...
@@ -106,7 +106,7 @@ public:
const
SwRangeRedline
*
GetRedline
()
const
{
return
pRedline
;}
protected
:
//SwClient
virtual
void
Modify
(
const
SfxPoolItem
*
pOld
,
const
SfxPoolItem
*
pNew
)
override
;
virtual
void
Modify
(
const
SfxPoolItem
*
pOld
,
const
SfxPoolItem
*
pNew
)
override
;
};
#endif
...
...
sw/inc/unoredlines.hxx
Dosyayı görüntüle @
698153d9
...
...
@@ -85,7 +85,7 @@ public:
virtual
css
::
uno
::
Sequence
<
OUString
>
SAL_CALL
getSupportedServiceNames
()
throw
(
css
::
uno
::
RuntimeException
,
std
::
exception
)
override
;
protected
:
//SwClient
virtual
void
Modify
(
const
SfxPoolItem
*
pOld
,
const
SfxPoolItem
*
pNew
)
override
;
virtual
void
Modify
(
const
SfxPoolItem
*
pOld
,
const
SfxPoolItem
*
pNew
)
override
;
};
#endif
...
...
sw/source/core/doc/textboxhelper.cxx
Dosyayı görüntüle @
698153d9
...
...
@@ -58,7 +58,7 @@ void SwTextBoxHelper::create(SwFrameFormat* pShape)
// Link FLY and DRAW formats, so it becomes a text box (needed for syncProperty calls).
uno
::
Reference
<
text
::
XTextFrame
>
xRealTextFrame
(
xTextFrame
,
uno
::
UNO_QUERY
);
SwXTextFrame
*
pTextFrame
=
dynamic_cast
<
SwXTextFrame
*>
(
xRealTextFrame
.
get
());
SwXTextFrame
*
pTextFrame
=
dynamic_cast
<
SwXTextFrame
*>
(
xRealTextFrame
.
get
());
assert
(
nullptr
!=
pTextFrame
);
SwFrameFormat
*
pFormat
=
pTextFrame
->
GetFrameFormat
();
...
...
@@ -128,24 +128,24 @@ void SwTextBoxHelper::destroy(SwFrameFormat* pShape)
bool
SwTextBoxHelper
::
isTextBox
(
const
SwFrameFormat
*
pShape
,
sal_uInt16
nType
)
{
assert
(
nType
==
RES_FLYFRMFMT
||
nType
==
RES_DRAWFRMFMT
);
if
(
!
pShape
||
pShape
->
Which
()
!=
nType
||
!
pShape
->
GetAttrSet
().
HasItem
(
RES_CNTNT
))
return
false
;
assert
(
nType
==
RES_FLYFRMFMT
||
nType
==
RES_DRAWFRMFMT
);
if
(
!
pShape
||
pShape
->
Which
()
!=
nType
||
!
pShape
->
GetAttrSet
().
HasItem
(
RES_CNTNT
))
return
false
;
sal_uInt16
nOtherType
=
(
pShape
->
Which
()
==
RES_FLYFRMFMT
)
?
RES_DRAWFRMFMT
:
RES_FLYFRMFMT
;
SwFrameFormat
*
pFormat
=
pShape
->
GetOtherTextBoxFormat
();
if
(
!
pFormat
)
return
false
;
sal_uInt16
nOtherType
=
(
pShape
->
Which
()
==
RES_FLYFRMFMT
)
?
RES_DRAWFRMFMT
:
RES_FLYFRMFMT
;
SwFrameFormat
*
pFormat
=
pShape
->
GetOtherTextBoxFormat
();
if
(
!
pFormat
)
return
false
;
assert
(
pFormat
->
Which
()
==
nOtherType
);
if
(
pFormat
->
Which
()
!=
nOtherType
)
return
false
;
assert
(
pFormat
->
Which
()
==
nOtherType
);
if
(
pFormat
->
Which
()
!=
nOtherType
)
return
false
;
const
SwFormatContent
&
rContent
=
pShape
->
GetContent
();
if
(
!
pFormat
->
GetAttrSet
().
HasItem
(
RES_CNTNT
)
||
pFormat
->
GetContent
()
!=
rContent
)
return
false
;
const
SwFormatContent
&
rContent
=
pShape
->
GetContent
();
if
(
!
pFormat
->
GetAttrSet
().
HasItem
(
RES_CNTNT
)
||
pFormat
->
GetContent
()
!=
rContent
)
return
false
;
return
true
;
return
true
;
}
bool
SwTextBoxHelper
::
isTextBox
(
const
SdrObject
*
pObject
)
...
...
@@ -226,7 +226,7 @@ sal_Int32 SwTextBoxHelper::getOrdNum(const SdrObject* pObject)
void
SwTextBoxHelper
::
getShapeWrapThrough
(
const
SwFrameFormat
*
pTextBox
,
bool
&
rWrapThrough
)
{
SwFrameFormat
*
pShape
=
SwTextBoxHelper
::
getOtherTextBoxFormat
(
pTextBox
,
RES_FLYFRMFMT
);
SwFrameFormat
*
pShape
=
SwTextBoxHelper
::
getOtherTextBoxFormat
(
pTextBox
,
RES_FLYFRMFMT
);
if
(
pShape
)
rWrapThrough
=
pShape
->
GetSurround
().
GetSurround
()
==
SURROUND_THROUGHT
;
}
...
...
@@ -238,13 +238,13 @@ SwFrameFormat* SwTextBoxHelper::getOtherTextBoxFormat(const SwFrameFormat* pForm
return
pFormat
->
GetOtherTextBoxFormat
();
}
SwFrameFormat
*
SwTextBoxHelper
::
getOtherTextBoxFormat
(
uno
::
Reference
<
drawing
::
XShape
>
const
&
xShape
)
SwFrameFormat
*
SwTextBoxHelper
::
getOtherTextBoxFormat
(
uno
::
Reference
<
drawing
::
XShape
>
const
&
xShape
)
{
SwXShape
*
pShape
=
dynamic_cast
<
SwXShape
*>
(
xShape
.
get
());
if
(
!
pShape
)
return
nullptr
;
SwFrameFormat
*
pFormat
=
pShape
->
GetFrameFormat
();
SwFrameFormat
*
pFormat
=
pShape
->
GetFrameFormat
();
return
getOtherTextBoxFormat
(
pFormat
,
RES_DRAWFRMFMT
);
}
...
...
xmlsecurity/qa/unit/signing/signing.cxx
Dosyayı görüntüle @
698153d9
...
...
@@ -115,7 +115,7 @@ void SigningTest::setUp()
// Set up cert8.db in workdir/CppunitTest/
OUString
aSourceDir
=
m_directories
.
getURLFromSrc
(
DATA_DIRECTORY
);
OUString
aTargetDir
=
m_directories
.
getURLFromWorkdir
(
"/CppunitTest/xmlsecurity_signing.test.user/"
);
"/CppunitTest/xmlsecurity_signing.test.user/"
);
osl
::
File
::
copy
(
aSourceDir
+
"cert8.db"
,
aTargetDir
+
"cert8.db"
);
OUString
aTargetPath
;
osl
::
FileBase
::
getSystemPathFromFileURL
(
aTargetDir
,
aTargetPath
);
...
...
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