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
7477ab13
Kaydet (Commit)
7477ab13
authored
Eki 17, 2016
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:inlineablemethods in xmloff
Change-Id: I22202f85c65a862ccdafe1d521e2945e3d99252a
üst
281fa6ac
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
12 additions
and
73 deletions
+12
-73
shapeexport.hxx
include/xmloff/shapeexport.hxx
+0
-1
xmlexp.hxx
include/xmloff/xmlexp.hxx
+0
-3
xmlimp.hxx
include/xmloff/xmlimp.hxx
+0
-3
urlparameter.cxx
xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+1
-1
urlparameter.hxx
xmlhelp/source/cxxhelp/provider/urlparameter.hxx
+0
-2
xexptran.hxx
xmloff/inc/xexptran.hxx
+0
-4
DomExport.cxx
xmloff/source/core/DomExport.cxx
+1
-7
xmlexp.cxx
xmloff/source/core/xmlexp.cxx
+1
-6
xmlimp.cxx
xmloff/source/core/xmlimp.cxx
+1
-6
animationexport.cxx
xmloff/source/draw/animationexport.cxx
+1
-7
sdxmlimp.cxx
xmloff/source/draw/sdxmlimp.cxx
+1
-1
sdxmlimp_impl.hxx
xmloff/source/draw/sdxmlimp_impl.hxx
+0
-2
shapeexport.cxx
xmloff/source/draw/shapeexport.cxx
+1
-1
xexptran.cxx
xmloff/source/draw/xexptran.cxx
+2
-16
XMLTextListBlockContext.cxx
xmloff/source/text/XMLTextListBlockContext.cxx
+1
-1
XMLTextListBlockContext.hxx
xmloff/source/text/XMLTextListBlockContext.hxx
+0
-1
ChartPlotAreaOASISTContext.cxx
xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
+1
-3
securityenvironment_nssimpl.cxx
...ecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+1
-5
securityenvironment_nssimpl.hxx
...ecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
+0
-3
No files found.
include/xmloff/shapeexport.hxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -297,7 +297,6 @@ public:
static
SvXMLExportPropertyMapper
*
CreateShapePropMapper
(
SvXMLExport
&
rExport
);
void
enableLayerExport
()
{
mbExportLayer
=
true
;
}
bool
IsLayerExportEnabled
()
const
{
return
mbExportLayer
;
}
/** defines if the export should increment the progress bar or not */
void
enableHandleProgressBar
()
{
mbHandleProgressBar
=
true
;
}
...
...
include/xmloff/xmlexp.hxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -543,9 +543,6 @@ public:
/// returns the deterministic version for odf export
SvtSaveOptions
::
ODFSaneDefaultVersion
getSaneDefaultVersion
()
const
;
/// name of stream in package, e.g., "content.xml"
OUString
GetStreamName
()
const
;
// FIXME: this is only for legacy stuff that has not yet been adapted
// to implement XMetadatable; this can write duplicate IDs!
/// add xml:id and legacy namespace id
...
...
include/xmloff/xmlimp.hxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -484,9 +484,6 @@ public:
OUString
GetBaseURL
()
const
;
OUString
GetDocumentBase
()
const
;
/// name of stream in package, e.g., "content.xml"
OUString
GetStreamName
()
const
;
/// set the XmlId attribute of given UNO object (for RDF metadata)
void
SetXmlId
(
css
::
uno
::
Reference
<
css
::
uno
::
XInterface
>
const
&
i_xIfc
,
...
...
xmlhelp/source/cxxhelp/provider/urlparameter.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -102,7 +102,7 @@ OString URLParameter::getByName( const char* par )
else
if
(
strcmp
(
par
,
"System"
)
==
0
)
val
=
get_system
();
else
if
(
strcmp
(
par
,
"HelpPrefix"
)
==
0
)
val
=
get_prefix
()
;
val
=
m_aPrefix
;
return
OString
(
val
.
getStr
(),
val
.
getLength
(),
RTL_TEXTENCODING_UTF8
);
}
...
...
xmlhelp/source/cxxhelp/provider/urlparameter.hxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -147,8 +147,6 @@ namespace chelp {
return
m_aModule
;
}
const
OUString
&
get_prefix
()
const
{
return
m_aPrefix
;
}
OUString
const
&
get_language
();
OUString
const
&
get_program
();
...
...
xmloff/inc/xexptran.hxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -51,8 +51,6 @@ class SdXMLImExTransform2D
std
::
vector
<
std
::
shared_ptr
<
ImpSdXMLExpTransObj2DBase
>
>
maList
;
OUString
msString
;
void
EmptyList
();
public
:
SdXMLImExTransform2D
()
{}
...
...
@@ -73,8 +71,6 @@ class SdXMLImExTransform3D
std
::
vector
<
std
::
shared_ptr
<
ImpSdXMLExpTransObj3DBase
>
>
maList
;
OUString
msString
;
void
EmptyList
();
public
:
SdXMLImExTransform3D
()
{}
SdXMLImExTransform3D
(
const
OUString
&
rNew
,
const
SvXMLUnitConverter
&
rConv
);
...
...
xmloff/source/core/DomExport.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -125,7 +125,6 @@ class DomExport: public DomVisitor
vector
<
SvXMLNamespaceMap
>
maNamespaces
;
void
pushNamespace
();
void
popNamespace
();
void
addNamespace
(
const
OUString
&
sPrefix
,
const
OUString
&
sURI
);
OUString
qualifiedName
(
const
OUString
&
sPrefix
,
const
OUString
&
sURI
,
const
OUString
&
sLocalName
);
...
...
@@ -161,11 +160,6 @@ void DomExport::pushNamespace()
maNamespaces
.
push_back
(
aMap
);
}
void
DomExport
::
popNamespace
()
{
maNamespaces
.
pop_back
();
}
void
DomExport
::
addNamespace
(
const
OUString
&
sPrefix
,
const
OUString
&
sURI
)
{
SvXMLNamespaceMap
&
rMap
=
maNamespaces
.
back
();
...
...
@@ -234,7 +228,7 @@ void DomExport::element( const Reference<XElement>& xElement )
void
DomExport
::
endElement
(
const
Reference
<
XElement
>&
xElement
)
{
mrExport
.
EndElement
(
qualifiedName
(
xElement
),
false
);
popNamespace
();
maNamespaces
.
pop_back
();
}
void
DomExport
::
character
(
const
Reference
<
XCharacterData
>&
xChars
)
...
...
xmloff/source/core/xmlexp.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -2365,11 +2365,6 @@ SvtSaveOptions::ODFSaneDefaultVersion SvXMLExport::getSaneDefaultVersion() const
return
SvtSaveOptions
::
ODFSVER_LATEST
;
}
OUString
SvXMLExport
::
GetStreamName
()
const
{
return
mpImpl
->
mStreamName
;
}
void
SvXMLExport
::
AddAttributeIdLegacy
(
sal_uInt16
const
nLegacyPrefix
,
OUString
const
&
rValue
)
...
...
@@ -2403,7 +2398,7 @@ SvXMLExport::AddAttributeXmlId(uno::Reference<uno::XInterface> const & i_xIfc)
const
beans
::
StringPair
mdref
(
xMeta
->
getMetadataReference
()
);
if
(
!
mdref
.
Second
.
isEmpty
()
)
{
const
OUString
streamName
(
GetStreamName
()
)
;
const
OUString
streamName
=
mpImpl
->
mStreamName
;
if
(
!
streamName
.
isEmpty
()
)
{
if
(
streamName
.
equals
(
mdref
.
First
)
)
...
...
xmloff/source/core/xmlimp.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -1929,11 +1929,6 @@ OUString SvXMLImport::GetDocumentBase() const
return
mpImpl
->
aDocBase
.
GetMainURL
(
INetURLObject
::
NO_DECODE
);
}
OUString
SvXMLImport
::
GetStreamName
()
const
{
return
mpImpl
->
mStreamName
;
}
// Convert drawing object positions from OOo file format to OASIS (#i28749#)
bool
SvXMLImport
::
IsShapePositionInHoriL2R
()
const
{
...
...
@@ -2009,7 +2004,7 @@ void SvXMLImport::SetXmlId(uno::Reference<uno::XInterface> const & i_xIfc,
uno
::
UNO_QUERY
);
//FIXME: not yet
if
(
xMeta
.
is
())
{
const
beans
::
StringPair
mdref
(
GetStreamName
()
,
i_rXmlId
);
const
beans
::
StringPair
mdref
(
mpImpl
->
mStreamName
,
i_rXmlId
);
try
{
xMeta
->
setMetadataReference
(
mdref
);
}
catch
(
lang
::
IllegalArgumentException
&
)
{
...
...
xmloff/source/draw/animationexport.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -518,7 +518,6 @@ public:
static
void
convertPath
(
OUStringBuffer
&
sTmp
,
const
Any
&
rPath
);
void
convertValue
(
XMLTokenEnum
eAttributeName
,
OUStringBuffer
&
sTmp
,
const
Any
&
rValue
)
const
;
void
convertTiming
(
OUStringBuffer
&
sTmp
,
const
Any
&
rTiming
)
const
;
void
convertSource
(
OUStringBuffer
&
sTmp
,
const
Any
&
rSource
)
const
;
void
convertTarget
(
OUStringBuffer
&
sTmp
,
const
Any
&
rTarget
)
const
;
void
prepareValue
(
const
Any
&
rValue
);
...
...
@@ -1564,7 +1563,7 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa
{
if
(
pEvent
->
Source
.
hasValue
()
)
{
convert
Source
(
sTmp
,
pEvent
->
Source
);
convert
Target
(
sTmp
,
pEvent
->
Source
);
sTmp
.
append
(
'.'
);
}
...
...
@@ -1589,11 +1588,6 @@ void AnimationsExporterImpl::convertTiming( OUStringBuffer& sTmp, const Any& rVa
}
}
void
AnimationsExporterImpl
::
convertSource
(
OUStringBuffer
&
sTmp
,
const
Any
&
rSource
)
const
{
convertTarget
(
sTmp
,
rSource
);
}
void
AnimationsExporterImpl
::
convertTarget
(
OUStringBuffer
&
sTmp
,
const
Any
&
rTarget
)
const
{
if
(
!
rTarget
.
hasValue
()
)
...
...
xmloff/source/draw/sdxmlimp.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -641,7 +641,7 @@ SvXMLImportContext *SdXMLImport::CreateMetaContext(const OUString& rLocalName,
uno
::
Reference
<
document
::
XDocumentPropertiesSupplier
>
xDPS
(
GetModel
(),
uno
::
UNO_QUERY_THROW
);
uno
::
Reference
<
document
::
XDocumentProperties
>
const
xDocProps
(
(
IsStylesOnlyMode
())
?
nullptr
:
xDPS
->
getDocumentProperties
());
!
mbLoadDoc
?
nullptr
:
xDPS
->
getDocumentProperties
());
pContext
=
new
SvXMLMetaDocumentContext
(
*
this
,
XML_NAMESPACE_OFFICE
,
rLocalName
,
xDocProps
);
...
...
xmloff/source/draw/sdxmlimp_impl.hxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -218,8 +218,6 @@ public:
// Styles and AutoStyles contexts
bool
IsStylesOnlyMode
()
const
{
return
!
mbLoadDoc
;
}
const
SvXMLTokenMap
&
GetDocElemTokenMap
();
const
SvXMLTokenMap
&
GetBodyElemTokenMap
();
const
SvXMLTokenMap
&
GetStylesElemTokenMap
();
...
...
xmloff/source/draw/shapeexport.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -704,7 +704,7 @@ void XMLShapeExport::exportShape(const uno::Reference< drawing::XShape >& xShape
}
// export layer information
if(
IsLayerExportEnabled()
)
if(
mbExportLayer
)
{
// check for group or scene shape and not export layer if this is one
uno::Reference< drawing::XShapes > xShapes( xShape, uno::UNO_QUERY );
...
...
xmloff/source/draw/xexptran.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -224,13 +224,6 @@ struct ImpSdXMLExpTransObj2DMatrix : public ImpSdXMLExpTransObj2DBase
:
ImpSdXMLExpTransObj2DBase
(
IMP_SDXMLEXP_TRANSOBJ2D_MATRIX
),
maMatrix
(
rNew
)
{}
};
// delete all entries in list
void
SdXMLImExTransform2D
::
EmptyList
()
{
maList
.
clear
();
}
// add members
void
SdXMLImExTransform2D
::
AddRotate
(
double
fNew
)
...
...
@@ -357,7 +350,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
void
SdXMLImExTransform2D
::
SetString
(
const
OUString
&
rNew
,
const
SvXMLUnitConverter
&
rConv
)
{
msString
=
rNew
;
EmptyList
();
maList
.
clear
();
if
(
!
msString
.
isEmpty
())
{
...
...
@@ -602,13 +595,6 @@ struct ImpSdXMLExpTransObj3DMatrix : public ImpSdXMLExpTransObj3DBase
:
ImpSdXMLExpTransObj3DBase
(
IMP_SDXMLEXP_TRANSOBJ3D_MATRIX
),
maMatrix
(
rNew
)
{}
};
// delete all entries in list
void
SdXMLImExTransform3D
::
EmptyList
()
{
maList
.
clear
();
}
// add members
void
SdXMLImExTransform3D
::
AddMatrix
(
const
::
basegfx
::
B3DHomMatrix
&
rNew
)
...
...
@@ -777,7 +763,7 @@ SdXMLImExTransform3D::SdXMLImExTransform3D(const OUString& rNew, const SvXMLUnit
void
SdXMLImExTransform3D
::
SetString
(
const
OUString
&
rNew
,
const
SvXMLUnitConverter
&
rConv
)
{
msString
=
rNew
;
EmptyList
();
maList
.
clear
();
if
(
!
msString
.
isEmpty
())
{
...
...
xmloff/source/text/XMLTextListBlockContext.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -75,7 +75,7 @@ XMLTextListBlockContext::XMLTextListBlockContext(
{
XMLTextListBlockContext
*
pParent
=
static_cast
<
XMLTextListBlockContext
*>
(
mxParentListBlock
.
get
());
msListStyleName
=
pParent
->
GetListStyleName
()
;
msListStyleName
=
pParent
->
msListStyleName
;
sParentListStyleName
=
msListStyleName
;
mxNumRules
=
pParent
->
GetNumRules
();
mnLevel
=
pParent
->
GetLevel
()
+
1
;
...
...
xmloff/source/text/XMLTextListBlockContext.hxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -65,7 +65,6 @@ public:
const
OUString
&
rLocalName
,
const
css
::
uno
::
Reference
<
css
::
xml
::
sax
::
XAttributeList
>
&
xAttrList
)
override
;
const
OUString
&
GetListStyleName
()
const
{
return
msListStyleName
;
}
sal_Int16
GetLevel
()
const
{
return
mnLevel
;
}
bool
IsRestartNumbering
()
const
{
return
mbRestartNumbering
;
}
void
ResetRestartNumbering
()
{
mbRestartNumbering
=
false
;
}
...
...
xmloff/source/transform/ChartPlotAreaOASISTContext.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -49,8 +49,6 @@ public:
virtual
void
StartElement
(
const
Reference
<
xml
::
sax
::
XAttributeList
>&
rAttrList
)
override
;
virtual
void
EndElement
()
override
;
bool
IsCategoryAxis
()
const
{
return
m_bHasCategories
;}
private
:
::
rtl
::
Reference
<
XMLPersAttrListTContext
>
&
m_rCategoriesContext
;
bool
m_bHasCategories
;
...
...
@@ -155,7 +153,7 @@ void XMLAxisOASISContext::StartElement(
void
XMLAxisOASISContext
::
EndElement
()
{
// if we have categories, change the "class" attribute
if
(
IsCategoryAxis
()
&&
if
(
m_bHasCategories
&&
m_rCategoriesContext
.
is
()
)
{
OSL_ENSURE
(
GetAttrList
().
is
(),
"Invalid attribute list"
);
...
...
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -220,10 +220,6 @@ void SecurityEnvironment_NssImpl::addCryptoSlot( PK11SlotInfo* aSlot) throw( Exc
m_Slots
.
push_back
(
aSlot
);
}
CERTCertDBHandle
*
SecurityEnvironment_NssImpl
::
getCertDb
()
throw
(
Exception
,
RuntimeException
)
{
return
m_pHandler
;
}
//Could we have multiple cert dbs?
void
SecurityEnvironment_NssImpl
::
setCertDb
(
CERTCertDBHandle
*
aCertDb
)
throw
(
Exception
,
RuntimeException
)
{
m_pHandler
=
aCertDb
;
...
...
@@ -909,7 +905,7 @@ xmlSecKeysMngrPtr SecurityEnvironment_NssImpl::createKeysManager() throw( Except
SECKEYPrivateKey
*
priKey
=
nullptr
;
xmlSecKeysMngrPtr
pKeysMngr
=
nullptr
;
handler
=
this
->
getCertDb
()
;
handler
=
m_pHandler
;
/*-
* The following lines is based on the private version of xmlSec-NSS
...
...
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx
Dosyayı görüntüle @
7477ab13
...
...
@@ -105,9 +105,6 @@ private:
static
const
css
::
uno
::
Sequence
<
sal_Int8
>&
getUnoTunnelId
()
;
//Native methods
CERTCertDBHandle
*
getCertDb
()
throw
(
css
::
uno
::
Exception
,
css
::
uno
::
RuntimeException
)
;
void
setCertDb
(
CERTCertDBHandle
*
aCertDb
)
throw
(
css
::
uno
::
Exception
,
css
::
uno
::
RuntimeException
)
;
void
adoptSymKey
(
PK11SymKey
*
aSymKey
)
throw
(
css
::
uno
::
Exception
,
css
::
uno
::
RuntimeException
)
;
...
...
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