summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/draw/eventimp.cxx2
-rw-r--r--xmloff/source/forms/elementimport.cxx10
-rw-r--r--xmloff/source/forms/layerimport.cxx2
-rw-r--r--xmloff/source/text/XMLPropertyBackpatcher.cxx7
-rw-r--r--xmloff/source/text/XMLTextFrameContext.cxx8
-rw-r--r--xmloff/source/text/XMLTextListBlockContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextListItemContext.cxx2
-rw-r--r--xmloff/source/text/XMLTextMarkImportContext.cxx12
-rw-r--r--xmloff/source/text/txtimp.cxx54
-rw-r--r--xmloff/source/text/txtlists.cxx2
-rw-r--r--xmloff/source/text/txtparae.cxx10
11 files changed, 55 insertions, 56 deletions
diff --git a/xmloff/source/draw/eventimp.cxx b/xmloff/source/draw/eventimp.cxx
index 0be658c134e8..7488da10cd20 100644
--- a/xmloff/source/draw/eventimp.cxx
+++ b/xmloff/source/draw/eventimp.cxx
@@ -155,7 +155,7 @@ SdXMLEventContext::SdXMLEventContext( SvXMLImport& rImp, sal_uInt16 nPrfx, cons
, meDirection(ED_none), mnStartScale(100), meSpeed(AnimationSpeed_MEDIUM)
, mnVerb(0), mbPlayFull(false)
{
- static const OUString sXMLClickName( "click" );
+ static const char sXMLClickName[] = "click";
if( nPrfx == XML_NAMESPACE_PRESENTATION && IsXMLToken( rLocalName, XML_EVENT_LISTENER ) )
{
diff --git a/xmloff/source/forms/elementimport.cxx b/xmloff/source/forms/elementimport.cxx
index 54cf3e45c505..0040d5ddbf19 100644
--- a/xmloff/source/forms/elementimport.cxx
+++ b/xmloff/source/forms/elementimport.cxx
@@ -450,10 +450,10 @@ namespace xmloff
{
// no optimization here. If this method gets called, the XML stream did not contain a name for the
// element, which is a heavy error. So in this case we don't care for performance
- static const OUString sUnnamedName("unnamed");
+ static const char sUnnamedName[] = "unnamed";
OSL_ENSURE(m_xParentContainer.is(), "OElementImport::implGetDefaultName: no parent container!");
if (!m_xParentContainer.is())
- return sUnnamedName;
+ return OUString(sUnnamedName);
Sequence< OUString > aNames = m_xParentContainer->getElementNames();
OUString sReturn;
@@ -478,7 +478,7 @@ namespace xmloff
return sReturn;
}
OSL_FAIL("OElementImport::implGetDefaultName: did not find a free name!");
- return sUnnamedName;
+ return OUString(sUnnamedName);
}
PropertyGroups::const_iterator OElementImport::impl_matchPropertyGroup( const PropertyGroups& i_propertyGroups ) const
@@ -1546,12 +1546,12 @@ namespace xmloff
const Reference< XAttributeList >& _rxAttrList)
{
// is it the "option" sub tag of a listbox ?
- static const OUString s_sOptionElementName("option");
+ static const char s_sOptionElementName[] = "option";
if (s_sOptionElementName == _rLocalName)
return new OListOptionImport(GetImport(), _nPrefix, _rLocalName, this);
// is it the "item" sub tag of a combobox ?
- static const OUString s_sItemElementName("item");
+ static const char s_sItemElementName[] = "item";
if (s_sItemElementName == _rLocalName)
return new OComboItemImport(GetImport(), _nPrefix, _rLocalName, this);
diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx
index 55e58a3bd524..125abd40a852 100644
--- a/xmloff/source/forms/layerimport.cxx
+++ b/xmloff/source/forms/layerimport.cxx
@@ -517,7 +517,7 @@ void OFormLayerXMLImport_Impl::documentDone( )
&& FormCellBindingHelper::isCellBindingAllowed( rImport.GetModel() )
)
{
- static OUString s_sIndex( ":index" );
+ static const char s_sIndex[] = ":index";
::std::vector< ModelStringPair >::const_iterator aEnd = m_aCellValueBindings.end();
for ( ::std::vector< ModelStringPair >::const_iterator aCellBindings = m_aCellValueBindings.begin();
aCellBindings != aEnd;
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index 86d6297d8418..9b514a0b5a4c 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -171,10 +171,9 @@ XMLTextImportHelper::MakeBackpatcherImpl()
return ::boost::shared_ptr<BackpatcherImpl>(new BackpatcherImpl);
}
-static OUString const& GetSequenceNumber()
+static OUString GetSequenceNumber()
{
- static OUString s_SequenceNumber("SequenceNumber");
- return s_SequenceNumber;
+ return OUString("SequenceNumber");
}
@@ -213,7 +212,7 @@ XMLPropertyBackpatcher<sal_Int16>& XMLTextImportHelper::GetSequenceIdBP()
XMLPropertyBackpatcher<OUString>& XMLTextImportHelper::GetSequenceNameBP()
{
- static OUString s_SourceName("SourceName");
+ static const char s_SourceName[] = "SourceName";
if (!m_pBackpatcherImpl->m_pSequenceNameBackpatcher.get())
{
m_pBackpatcherImpl->m_pSequenceNameBackpatcher.reset(
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index f7ccbea71178..9231870a3f93 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1264,10 +1264,10 @@ void XMLTextFrameContext_Impl::SetHyperlink( const OUString& rHRef,
const OUString& rTargetFrameName,
bool bMap )
{
- static OUString s_HyperLinkURL("HyperLinkURL");
- static OUString s_HyperLinkName("HyperLinkName");
- static OUString s_HyperLinkTarget("HyperLinkTarget");
- static OUString s_ServerMap("ServerMap");
+ static const char s_HyperLinkURL[] = "HyperLinkURL";
+ static const char s_HyperLinkName[] = "HyperLinkName";
+ static const char s_HyperLinkTarget[] = "HyperLinkTarget";
+ static const char s_ServerMap[] = "ServerMap";
if( !xPropSet.is() )
return;
diff --git a/xmloff/source/text/XMLTextListBlockContext.cxx b/xmloff/source/text/XMLTextListBlockContext.cxx
index 25bab0ec5b9f..f396ede30b13 100644
--- a/xmloff/source/text/XMLTextListBlockContext.cxx
+++ b/xmloff/source/text/XMLTextListBlockContext.cxx
@@ -60,7 +60,7 @@ XMLTextListBlockContext::XMLTextListBlockContext(
, msListId()
, msContinueListId()
{
- static OUString s_PropNameDefaultListId("DefaultListId");
+ static const char s_PropNameDefaultListId[] = "DefaultListId";
{
// get the parent list block context (if any); this is a bit ugly...
XMLTextListBlockContext * pLB(0);
diff --git a/xmloff/source/text/XMLTextListItemContext.cxx b/xmloff/source/text/XMLTextListItemContext.cxx
index 26886337f318..71dea66d6991 100644
--- a/xmloff/source/text/XMLTextListItemContext.cxx
+++ b/xmloff/source/text/XMLTextListItemContext.cxx
@@ -50,7 +50,7 @@ XMLTextListItemContext::XMLTextListItemContext(
mnSubListCount( 0 ),
mxNumRulesOverride()
{
- static OUString s_NumberingRules("NumberingRules");
+ static const char s_NumberingRules[] = "NumberingRules";
sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
for( sal_Int16 i=0; i < nAttrCount; i++ )
{
diff --git a/xmloff/source/text/XMLTextMarkImportContext.cxx b/xmloff/source/text/XMLTextMarkImportContext.cxx
index 8aaa952bbba9..f8f47206ecb5 100644
--- a/xmloff/source/text/XMLTextMarkImportContext.cxx
+++ b/xmloff/source/text/XMLTextMarkImportContext.cxx
@@ -183,10 +183,10 @@ void XMLTextMarkImportContext::EndElement()
{
SvXMLImportContext::EndElement();
- static const OUString sAPI_reference_mark( "com.sun.star.text.ReferenceMark");
- static const OUString sAPI_bookmark( "com.sun.star.text.Bookmark");
- static const OUString sAPI_fieldmark( "com.sun.star.text.Fieldmark");
- static const OUString sAPI_formfieldmark( "com.sun.star.text.FormFieldmark");
+ static const char sAPI_reference_mark[] = "com.sun.star.text.ReferenceMark";
+ static const char sAPI_bookmark[] = "com.sun.star.text.Bookmark";
+ static const char sAPI_fieldmark[] = "com.sun.star.text.Fieldmark";
+ static const char sAPI_formfieldmark[] = "com.sun.star.text.FormFieldmark";
if (!m_sBookmarkName.isEmpty())
{
@@ -213,7 +213,7 @@ void XMLTextMarkImportContext::EndElement()
// export point bookmark
const Reference<XInterface> xContent(
CreateAndInsertMark(GetImport(),
- (bImportAsField?sAPI_formfieldmark:sAPI_bookmark),
+ (bImportAsField ? OUString(sAPI_formfieldmark) : OUString(sAPI_bookmark)),
m_sBookmarkName,
m_rHelper.GetCursorAsRange()->getStart(),
m_sXmlId) );
@@ -291,7 +291,7 @@ void XMLTextMarkImportContext::EndElement()
// insert reference
const Reference<XInterface> xContent(
CreateAndInsertMark(GetImport(),
- (bImportAsField?sAPI_fieldmark:sAPI_bookmark),
+ (bImportAsField ? OUString(sAPI_fieldmark) : OUString(sAPI_bookmark)),
m_sBookmarkName,
xInsertionCursor,
m_sXmlId) );
diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx
index 8c954064e399..8954cb2db9eb 100644
--- a/xmloff/source/text/txtimp.cxx
+++ b/xmloff/source/text/txtimp.cxx
@@ -895,7 +895,7 @@ XMLTextImportHelper::XMLTextImportHelper(
bProgress, bBlockMode, bOrganizerMode) )
, m_pBackpatcherImpl( MakeBackpatcherImpl() )
{
- static OUString s_PropNameDefaultListId( "DefaultListId");
+ static const char s_PropNameDefaultListId[] = "DefaultListId";
Reference< XChapterNumberingSupplier > xCNSupplier( rModel, UNO_QUERY );
@@ -1410,19 +1410,19 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
// Numberings/Bullets in table not visible after save/reload (#i80724#)
bool bSetListAttrs )
{
- static OUString s_ParaStyleName( "ParaStyleName");
- static OUString s_CharStyleName( "CharStyleName");
- static OUString s_NumberingRules( "NumberingRules");
- static OUString s_NumberingIsNumber( "NumberingIsNumber");
- static OUString s_NumberingLevel( "NumberingLevel");
- static OUString s_ParaIsNumberingRestart( "ParaIsNumberingRestart");
- static OUString s_NumberingStartValue( "NumberingStartValue");
- static OUString s_PropNameListId( "ListId");
- static OUString s_PageDescName( "PageDescName");
- static OUString s_ServiceCombinedCharacters( "com.sun.star.text.TextField.CombinedCharacters");
- static OUString s_Content("Content");
- static OUString s_OutlineLevel( "OutlineLevel");
- static OUString s_NumberingStyleName( "NumberingStyleName");
+ static const char s_ParaStyleName[] = "ParaStyleName";
+ static const char s_CharStyleName[] = "CharStyleName";
+ static const char s_NumberingRules[] = "NumberingRules";
+ static const char s_NumberingIsNumber[] = "NumberingIsNumber";
+ static const char s_NumberingLevel[] = "NumberingLevel";
+ static const char s_ParaIsNumberingRestart[] = "ParaIsNumberingRestart";
+ static const char s_NumberingStartValue[] = "NumberingStartValue";
+ static const char s_PropNameListId[] = "ListId";
+ static const char s_PageDescName[] = "PageDescName";
+ static const char s_ServiceCombinedCharacters[] = "com.sun.star.text.TextField.CombinedCharacters";
+ static const char s_Content[] = "Content";
+ static const char s_OutlineLevel[] = "OutlineLevel";
+ static const char s_NumberingStyleName[] = "NumberingStyleName";
const sal_uInt16 nFamily = bPara ? XML_STYLE_FAMILY_TEXT_PARAGRAPH
: XML_STYLE_FAMILY_TEXT_TEXT;
@@ -1446,7 +1446,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
if( !sStyleName.isEmpty() )
{
sStyleName = rImport.GetStyleDisplayName( nFamily, sStyleName );
- const OUString& rPropName = (bPara) ? s_ParaStyleName : s_CharStyleName;
+ const OUString rPropName = bPara ? s_ParaStyleName : s_CharStyleName;
const Reference < XNameContainer > & rStyles = (bPara)
? m_pImpl->m_xParaStyles
: m_pImpl->m_xTextStyles;
@@ -1851,7 +1851,7 @@ OUString XMLTextImportHelper::SetStyleAndAttrs(
void XMLTextImportHelper::FindOutlineStyleName( OUString& rStyleName,
sal_Int8 nOutlineLevel )
{
- static OUString s_HeadingStyleName( "HeadingStyleName");
+ static const char s_HeadingStyleName[] = "HeadingStyleName";
// style name empty?
if( rStyleName.isEmpty() )
@@ -1915,8 +1915,8 @@ void XMLTextImportHelper::AddOutlineStyleCandidate( const sal_Int8 nOutlineLevel
void XMLTextImportHelper::SetOutlineStyles( bool bSetEmptyLevels )
{
- static OUString s_NumberingStyleName( "NumberingStyleName");
- static OUString s_HeadingStyleName( "HeadingStyleName");
+ static const char s_NumberingStyleName[] = "NumberingStyleName";
+ static const char s_HeadingStyleName [] = "HeadingStyleName";
if ((m_pImpl->m_pOutlineStylesCandidates != 0 || bSetEmptyLevels) &&
m_pImpl->m_xChapterNumbering.is() &&
@@ -2022,12 +2022,12 @@ void XMLTextImportHelper::SetHyperlink(
const OUString& rVisitedStyleName,
XMLEventsImportContext* pEvents)
{
- static OUString s_HyperLinkURL( "HyperLinkURL");
- static OUString s_HyperLinkName( "HyperLinkName");
- static OUString s_HyperLinkTarget( "HyperLinkTarget");
- static OUString s_UnvisitedCharStyleName( "UnvisitedCharStyleName");
- static OUString s_VisitedCharStyleName( "VisitedCharStyleName");
- static OUString s_HyperLinkEvents( "HyperLinkEvents");
+ static const char s_HyperLinkURL[] = "HyperLinkURL";
+ static const char s_HyperLinkName[] = "HyperLinkName";
+ static const char s_HyperLinkTarget[] = "HyperLinkTarget";
+ static const char s_UnvisitedCharStyleName[] = "UnvisitedCharStyleName";
+ static const char s_VisitedCharStyleName[] = "VisitedCharStyleName";
+ static const char s_HyperLinkEvents[] = "HyperLinkEvents";
Reference < XPropertySet > xPropSet( rCursor, UNO_QUERY );
Reference < XPropertySetInfo > xPropSetInfo(
@@ -2608,8 +2608,8 @@ void XMLTextImportHelper::ConnectFrameChains(
const OUString& rNextFrmName,
const Reference < XPropertySet >& rFrmPropSet )
{
- static OUString s_ChainNextName( "ChainNextName");
- static OUString s_ChainPrevName( "ChainPrevName");
+ static const char s_ChainNextName[] = "ChainNextName";
+ static const char s_ChainPrevName[] = "ChainPrevName";
if( rFrmName.isEmpty() )
return;
@@ -2657,7 +2657,7 @@ void XMLTextImportHelper::ConnectFrameChains(
bool XMLTextImportHelper::IsInFrame() const
{
- static OUString s_TextFrame( "TextFrame");
+ static const char s_TextFrame[] = "TextFrame";
bool bIsInFrame = false;
diff --git a/xmloff/source/text/txtlists.cxx b/xmloff/source/text/txtlists.cxx
index 52265c81df39..ccfc6853a5c6 100644
--- a/xmloff/source/text/txtlists.cxx
+++ b/xmloff/source/text/txtlists.cxx
@@ -442,7 +442,7 @@ XMLTextListsHelper::MakeNumRule(
bool* o_pRestartNumbering,
bool* io_pSetDefaults)
{
- static OUString s_NumberingRules( "NumberingRules");
+ static const char s_NumberingRules[] = "NumberingRules";
uno::Reference<container::XIndexReplace> xNumRules(i_rNumRule);
if ( !i_StyleName.isEmpty() && i_StyleName != i_ParentStyleName )
{
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 5b932114dd23..c13e687a0b48 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -2169,10 +2169,10 @@ void XMLTextParagraphExport::exportTextRangeEnumeration(
bool bAutoStyles, bool bIsProgress,
bool bPrvChrIsSpc )
{
- static const OUString sMeta("InContentMetadata");
- static const OUString sFieldMarkName("__FieldMark_");
- static OUString sAnnotation("Annotation");
- static OUString sAnnotationEnd("AnnotationEnd");
+ static const char sMeta[] = "InContentMetadata";
+ static const char sFieldMarkName[] = "__FieldMark_";
+ static const char sAnnotation[] = "Annotation";
+ static const char sAnnotationEnd[] = "AnnotationEnd";
bool bPrevCharIsSpace = bPrvChrIsSpc;
@@ -3717,7 +3717,7 @@ void XMLTextParagraphExport::exportMeta(
const Reference<XPropertySet> & i_xPortion,
bool i_bAutoStyles, bool i_isProgress)
{
- static OUString sMeta("InContentMetadata");
+ static const char sMeta[] = "InContentMetadata";
bool doExport(!i_bAutoStyles); // do not export element if autostyles
// check version >= 1.2
generated by cgit (git 2.34.1) at 2025-02-09 12:54:08 +0000