[Libreoffice-commits] .: 4 commits - comphelper/inc comphelper/source sw/inc sw/source unusedcode.easy xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Nov 2 03:36:49 PDT 2011
comphelper/inc/comphelper/embeddedobjectcontainer.hxx | 3 -
comphelper/inc/comphelper/mimeconfighelper.hxx | 3 -
comphelper/source/container/embeddedobjectcontainer.cxx | 24 ---------
comphelper/source/misc/mimeconfighelper.cxx | 15 -----
sw/inc/cmdid.h | 2
sw/source/core/access/accmap.cxx | 6 +-
sw/source/core/doc/docbasic.cxx | 8 +--
sw/source/core/edit/edtox.cxx | 4 -
sw/source/core/tox/toxhlp.cxx | 36 ++++++-------
sw/source/core/unocore/unofield.cxx | 9 +--
sw/source/core/unocore/unoframe.cxx | 14 +++--
sw/source/ui/dbui/dbmgr.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 2
sw/source/ui/shells/tabsh.cxx | 6 +-
sw/source/ui/uiview/formatclipboard.cxx | 6 +-
unusedcode.easy | 9 ---
xmloff/inc/xmloff/txtparae.hxx | 2
xmloff/inc/xmloff/xmlnume.hxx | 5 -
xmloff/source/style/xmlnume.cxx | 42 ----------------
xmloff/source/text/txtparae.cxx | 16 ------
20 files changed, 52 insertions(+), 162 deletions(-)
New commits:
commit de04c92dea40c906fdf2b9058bd3139134d62f15
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 2 10:36:12 2011 +0000
make this build
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index fae2a95..94d9692 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -614,7 +614,7 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_TABLE_MODE_FIX (FN_FORMAT + 189) /* table mode */
#define FN_TABLE_MODE_FIX_PROP (FN_FORMAT + 190) /* -"- */
#define FN_TABLE_MODE_VARIABLE (FN_FORMAT + 191) /* -"- */
-#define FN_TABLE_BOX_TEXTDIRECTION (FN_FORMAT + 192) /* text direction of table cells */
+#define FN_TABLE_BOX_TEXTORIENTATION (FN_FORMAT + 192) /* text orientation of table cells */
#define FN_TABLE_AUTOSUM (FN_FORMAT + 195) /* */
#define FN_SET_CONTROL_HANDLER (FN_FORMAT + 199) /* set macro */
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 44500b8..3c892ad 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -140,7 +140,7 @@ const sal_uInt16 aUITableAttrRange[] =
FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN,
RES_FRAMEDIR, RES_FRAMEDIR,
RES_ROW_SPLIT, RES_ROW_SPLIT,
- FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION,
+ FN_TABLE_BOX_TEXTORIENTATION, FN_TABLE_BOX_TEXTORIENTATION,
// #i29550#
RES_COLLAPSING_BORDERS, RES_COLLAPSING_BORDERS,
// <-- collapsing borders
@@ -188,7 +188,7 @@ static SwTableRep* lcl_TableParamToItemSet( SfxItemSet& rSet, SwWrtShell &rSh )
// text direction in boxes
SvxFrameDirectionItem aBoxDirection( FRMDIR_ENVIRONMENT, RES_FRAMEDIR );
if(rSh.GetBoxDirection( aBoxDirection ))
- rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTDIRECTION);
+ rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTORIENTATION);
sal_Bool bTableSel = rSh.IsTableMode();
if(!bTableSel)
@@ -309,7 +309,7 @@ void ItemSetToTableParam( const SfxItemSet& rSet,
const SfxPoolItem* pSplit = 0;
sal_Bool bRowSplit = SFX_ITEM_SET == rSet.GetItemState( RES_ROW_SPLIT, sal_False, &pSplit );
const SfxPoolItem* pBoxDirection = 0;
- sal_Bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTDIRECTION, sal_False, &pBoxDirection );
+ sal_Bool bBoxDirection = SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, sal_False, &pBoxDirection );
if( bBackground || bBorder || bRowSplit || bBoxDirection)
{
/*
diff --git a/sw/source/ui/uiview/formatclipboard.cxx b/sw/source/ui/uiview/formatclipboard.cxx
index 0fa7a6a..a9bfa3f 100644
--- a/sw/source/ui/uiview/formatclipboard.cxx
+++ b/sw/source/ui/uiview/formatclipboard.cxx
@@ -117,7 +117,7 @@ SfxItemSet* lcl_CreateEmptyItemSet( int nSelectionType, SfxItemPool& rPool
RES_KEEP, RES_KEEP,
RES_FRAMEDIR, RES_FRAMEDIR,
FN_PARAM_TABLE_HEADLINE, FN_PARAM_TABLE_HEADLINE,
- FN_TABLE_BOX_TEXTDIRECTION, FN_TABLE_BOX_TEXTDIRECTION,
+ FN_TABLE_BOX_TEXTORIENTATION, FN_TABLE_BOX_TEXTORIENTATION,
FN_TABLE_SET_VERT_ALIGN, FN_TABLE_SET_VERT_ALIGN,
0);
}
@@ -158,7 +158,7 @@ void lcl_getTableAttributes( SfxItemSet& rSet, SwWrtShell &rSh )
SvxFrameDirectionItem aBoxDirection( FRMDIR_ENVIRONMENT, RES_FRAMEDIR );
if(rSh.GetBoxDirection( aBoxDirection ))
- rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTDIRECTION);
+ rSet.Put(aBoxDirection, FN_TABLE_BOX_TEXTORIENTATION);
rSet.Put(SfxUInt16Item(FN_TABLE_SET_VERT_ALIGN, rSh.GetBoxAlign()));
@@ -255,7 +255,7 @@ void lcl_setTableAttributes( const SfxItemSet& rSet, SwWrtShell &rSh )
pFrmFmt->SetFmtAttr( *pItem );
}
- if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTDIRECTION, sal_False, &pItem) )
+ if( SFX_ITEM_SET == rSet.GetItemState( FN_TABLE_BOX_TEXTORIENTATION, sal_False, &pItem) )
{
SvxFrameDirectionItem aDirection( FRMDIR_ENVIRONMENT, RES_FRAMEDIR );
aDirection.SetValue(static_cast< const SvxFrameDirectionItem* >(pItem)->GetValue());
commit 7297ec19950c48f498d22bd88c1d3fccbe7d77ea
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 2 09:55:01 2011 +0000
update list post SvUShorts removal
diff --git a/unusedcode.easy b/unusedcode.easy
index 5936999..3baabe9 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -487,6 +487,8 @@ ScInputBarGroup::LinkStubImpl_ScrollHdl(void*, void*)
ScJobSetup::ScJobSetup(SfxPrinter*)
ScLeftFooterEditPage::GetRanges()
ScLeftHeaderEditPage::GetRanges()
+ScMacrosTest::testStarBasic()
+ScMacrosTest::testVba()
ScMatrix::CalcOffset(unsigned long, unsigned long) const
ScMultiTextWnd::GetLineCount()
ScMyCellInfo::ScMyCellInfo()
@@ -804,10 +806,6 @@ SvStringsSortDtor::Insert(SvStringsSortDtor const*, unsigned short, unsigned sho
SvStringsSortDtor::Remove(String* const&, unsigned short)
SvStringsSortDtor::Remove(unsigned short, unsigned short)
SvTabListBox::GetTabJustify(unsigned short) const
-SvUShorts::Insert(SvUShorts const*, unsigned short, unsigned short, unsigned short)
-SvUShorts::Replace(unsigned short const&, unsigned short)
-SvUShorts::Replace(unsigned short const*, unsigned short, unsigned short)
-SvUShorts::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned short const&, void*), void*)
SvUnoAttributeContainer::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const
SvXMLAutoStylePoolNamesP_Impl::Remove(rtl::OUString*)
diff --git a/xmloff/inc/xmloff/xmlnume.hxx b/xmloff/inc/xmloff/xmlnume.hxx
index 473bec6..7edda8c 100644
--- a/xmloff/inc/xmloff/xmlnume.hxx
+++ b/xmloff/inc/xmloff/xmlnume.hxx
@@ -98,11 +98,6 @@ public:
const ::rtl::OUString& rName,
const ::com::sun::star::uno::Reference<
::com::sun::star::container::XIndexReplace > & xNumRule );
-
- static sal_Bool GetOutlineStyles( XMLStringVector& rStyleNames,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XModel > & rModel );
-
};
#endif // _XMLOFF_XMLNUME_HXX
diff --git a/xmloff/source/style/xmlnume.cxx b/xmloff/source/style/xmlnume.cxx
index 58145c4..954587b 100644
--- a/xmloff/source/style/xmlnume.cxx
+++ b/xmloff/source/style/xmlnume.cxx
@@ -871,46 +871,4 @@ void SvxXMLNumRuleExport::exportStyles( sal_Bool bUsed,
}
}
-sal_Bool SvxXMLNumRuleExport::GetOutlineStyles( XMLStringVector& rStyleNames,
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::frame::XModel > & rModel )
-{
- Reference< XChapterNumberingSupplier > xCNSupplier( rModel,
- UNO_QUERY );
- sal_Int32 nLevels = 0;
- Reference< XIndexReplace > xNumRule;
- if( xCNSupplier.is() )
- {
- xNumRule = xCNSupplier->getChapterNumberingRules();
- if( xNumRule.is() )
- nLevels = xNumRule->getCount();
- }
-
- rStyleNames.resize( nLevels );
- for( sal_Int32 i=0; i<nLevels; i++ )
- {
- uno::Any aEntry( xNumRule->getByIndex( i ) );
- uno::Sequence<beans::PropertyValue> aSeq;
- if( aEntry >>= aSeq )
- {
- const sal_Int32 nCount = aSeq.getLength();
- const beans::PropertyValue* pPropArray = aSeq.getConstArray();
- for( sal_Int32 j=0; j<nCount; j++ )
- {
- const beans::PropertyValue& rProp = pPropArray[j];
-
- if( rProp.Name.equalsAsciiL(
- XML_UNO_NAME_NRULE_HEADING_STYLE_NAME,
- sizeof(XML_UNO_NAME_NRULE_HEADING_STYLE_NAME)-1 ) )
- {
- rProp.Value >>= rStyleNames[i];
- break;
- }
- }
- }
- }
-
- return nLevels != 0;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 40fbc430fdd9366cd0047724f831929378cdf679
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 1 22:44:45 2011 +0000
callcatcher: some unused code
diff --git a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
index 7983dec..8d1aab9 100644
--- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
+++ b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
@@ -124,9 +124,6 @@ public:
::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >
InsertEmbeddedObject( const ::com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream >&, ::rtl::OUString& );
- // copy an embedded object into the storage
- sal_Bool CopyEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >&, ::rtl::OUString& );
-
// copy an embedded object into the storage, open the new copy and return it
::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject > CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, /* TODO const ::rtl::OUString& aOrigName,*/ ::rtl::OUString& rName );
diff --git a/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx
index 992f367..c8eeed1 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/comphelper/inc/comphelper/mimeconfighelper.hxx
@@ -138,9 +138,6 @@ public:
static ::com::sun::star::uno::Sequence< sal_Int8 > GetSequenceClassID( sal_uInt32 n1, sal_uInt16 n2, sal_uInt16 n3,
sal_uInt8 b8, sal_uInt8 b9, sal_uInt8 b10, sal_uInt8 b11,
sal_uInt8 b12, sal_uInt8 b13, sal_uInt8 b14, sal_uInt8 b15 );
-
- ::com::sun::star::uno::Sequence<sal_Int8> GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName) ;
-
};
}
diff --git a/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 9f84b7a..8842205 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.cxx
@@ -711,30 +711,6 @@ sal_Bool EmbeddedObjectContainer::TryToCopyGraphReplacement( EmbeddedObjectConta
return bResult;
}
-sal_Bool EmbeddedObjectContainer::CopyEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName )
-{
- RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CopyEmbeddedObject" );
-
- OSL_FAIL( "This method is depricated! Use EmbeddedObjectContainer::CopyAndGetEmbeddedObject() to copy object!\n" );
-
- // get the object name before(!) it is assigned to a new storage
- ::rtl::OUString aOrigName;
- uno::Reference < embed::XEmbedPersist > xPersist( xObj, uno::UNO_QUERY );
- if ( xPersist.is() )
- aOrigName = xPersist->getEntryName();
-
- if ( !rName.getLength() )
- rName = CreateUniqueObjectName();
-
- if ( StoreEmbeddedObject( xObj, rName, sal_True ) )
- {
- TryToCopyGraphReplacement( rSrc, aOrigName, rName );
- return sal_True;
- }
-
- return sal_False;
-}
-
uno::Reference < embed::XEmbeddedObject > EmbeddedObjectContainer::CopyAndGetEmbeddedObject( EmbeddedObjectContainer& rSrc, const uno::Reference < embed::XEmbeddedObject >& xObj, ::rtl::OUString& rName )
{
RTL_LOGFILE_CONTEXT( aLog, "comphelper (mv76033) comphelper::EmbeddedObjectContainer::CopyAndGetEmbeddedObject" );
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index c81e761..dfa66e8 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.cxx
@@ -925,19 +925,4 @@ uno::Sequence< sal_Int8 > MimeConfigurationHelper::GetSequenceClassID( sal_uInt3
return aResult;
}
-//-------------------------------------------------------------------------
-uno::Sequence<sal_Int8> MimeConfigurationHelper::GetSequenceClassIDFromObjectName(const ::rtl::OUString& _sObjectName)
-{
- uno::Sequence<sal_Int8> aClassId;
- uno::Reference< container::XNameAccess > xObjectNames = GetConfigurationByPath(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/org.openoffice.Office.Embedding/ObjectNames")));
- uno::Reference< container::XNameAccess > xProps;
- if ( xObjectNames.is() && (xObjectNames->getByName(_sObjectName) >>= xProps) && xProps.is() )
- {
- ::rtl::OUString sValue;
- xProps->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClassID"))) >>= sValue;
- aClassId = GetSequenceClassIDRepresentation(sValue);
- }
- return aClassId;
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unusedcode.easy b/unusedcode.easy
index fddda51..5936999 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1354,7 +1354,6 @@ XMLTextListAutoStylePoolNames_Impl::Remove(rtl::OUString*)
XMLTextListAutoStylePool_Impl::GetPos(XMLTextListAutoStylePoolEntry_Impl const*) const
XMLTextListAutoStylePool_Impl::Remove(XMLTextListAutoStylePoolEntry_Impl*)
XMLTextParagraphExport::FindTextStyle(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> const&, unsigned char&) const
-XMLTextParagraphExport::GetHeadingLevel(rtl::OUString const&)
XMLVisAreaContext::XMLVisAreaContext(SvXMLImport&, unsigned short, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&, Rectangle&, short)
XPropertyList::Clear()
XSecController::collectToSign(int, rtl::OUString const&)
@@ -1982,7 +1981,6 @@ codemaker::cpp::typeToPrefix(TypeManager const&, rtl::OString const&)
comphelper::AccessibleEventNotifier::getEventListeners(unsigned int)
comphelper::AttributeList::AppendAttributeList(com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList> const&)
comphelper::AttributeList::Clear()
-comphelper::EmbeddedObjectContainer::CopyEmbeddedObject(comphelper::EmbeddedObjectContainer&, com::sun::star::uno::Reference<com::sun::star::embed::XEmbeddedObject> const&, rtl::OUString&)
comphelper::EventLogger::addLogHandler(com::sun::star::uno::Reference<com::sun::star::logging::XLogHandler> const&)
comphelper::EventLogger::getLogLevel() const
comphelper::EventLogger::getName() const
@@ -1991,7 +1989,6 @@ comphelper::EventLogger::setLogLevel(int) const
comphelper::FastPropertySetInfo::FastPropertySetInfo()
comphelper::FastPropertySetInfo::addProperty(com::sun::star::beans::Property const&)
comphelper::MimeConfigurationHelper::AddFilterNameCheckOwnFile(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
-comphelper::MimeConfigurationHelper::GetSequenceClassIDFromObjectName(rtl::OUString const&)
comphelper::OAccessibleImplementationAccess::setForeignControlledState(com::sun::star::uno::Reference<com::sun::star::accessibility::XAccessibleContext> const&, short, unsigned char)
comphelper::OAccessibleSelectionHelper::OAccessibleSelectionHelper()
comphelper::OAccessibleTextHelper::OAccessibleTextHelper()
diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx
index 17b0b3d..cb095eb 100644
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/xmloff/inc/xmloff/txtparae.hxx
@@ -673,8 +673,6 @@ public:
SinglePropertySetInfoCache& GetCharStyleNamesPropInfoCache() { return aCharStyleNamesPropInfoCache; }
- sal_Int32 GetHeadingLevel( const ::rtl::OUString& rStyleName );
-
void PushNewTextListsHelper();
void PopTextListsHelper();
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 14501ae..dac0b8e 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -3695,22 +3695,6 @@ void XMLTextParagraphExport::PreventExportOfControlsInMuteSections(
// else: no control shape -> nothing to do
}
}
-sal_Int32 XMLTextParagraphExport::GetHeadingLevel( const OUString& rStyleName )
-{
- if( !pHeadingStyles )
- {
- pHeadingStyles = new XMLStringVector;
- SvxXMLNumRuleExport::GetOutlineStyles( *pHeadingStyles,
- GetExport().GetModel() );
- }
- for( XMLStringVector::size_type i=0; i < pHeadingStyles->size(); ++i )
- {
- if( (*pHeadingStyles)[i] == rStyleName )
- return static_cast < sal_Int32 >( i );
- }
-
- return -1;
-}
void XMLTextParagraphExport::PushNewTextListsHelper()
{
commit 057d3225203543f6d0f2d658d884ed11241e88ee
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Nov 1 22:38:51 2011 +0000
ByteString->rtl::OString
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 1dc2c8c..4c03c4c 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -185,9 +185,9 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster& /*rBC*/,
{
(void)r;
#if OSL_DEBUG_LEVEL > 1
- ByteString aError( "Runtime exception caught while notifying shape.:\n" );
- aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US );
- OSL_FAIL( aError.GetBuffer() );
+ rtl::OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM("Runtime exception caught while notifying shape.:\n"));
+ aError.append(rtl::OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_FAIL( aError.getStr() );
#endif
}
}
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index 00c6d40..4f62133 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -128,8 +128,8 @@ sal_Bool SwDoc::ExecMacro( const SvxMacro& rMacro, String* pRet, SbxArray* pArgs
Sequence< sal_Int16 > aOutArgsIndex;
Sequence< Any > aOutArgs;
- OSL_TRACE( "SwDoc::ExecMacro URL is %s", ByteString( rMacro.GetMacName(),
- RTL_TEXTENCODING_UTF8).GetBuffer() );
+ OSL_TRACE( "SwDoc::ExecMacro URL is %s", rtl::OUStringToOString( rMacro.GetMacName(),
+ RTL_TEXTENCODING_UTF8).getStr() );
eErr = pDocShell->CallXScript(
rMacro.GetMacName(), *pUnoArgs, aRet, aOutArgsIndex, aOutArgs);
@@ -242,8 +242,8 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
Sequence< sal_Int16 > aOutArgsIndex;
Sequence< Any > aOutArgs;
- OSL_TRACE( "SwDoc::CallEvent URL is %s", ByteString(
- rMacro.GetMacName(), RTL_TEXTENCODING_UTF8).GetBuffer() );
+ OSL_TRACE( "SwDoc::CallEvent URL is %s", rtl::OUStringToOString(
+ rMacro.GetMacName(), RTL_TEXTENCODING_UTF8).getStr() );
nRet += 0 == pDocShell->CallXScript(
rMacro.GetMacName(), *pUnoArgs,aRet, aOutArgsIndex, aOutArgs) ? 1 : 0;
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 1bbf0b3..1e26155 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -385,14 +385,14 @@ void SwEditShell::ApplyAutoMark()
while( !rStrm.GetError() && !rStrm.IsEof() )
{
- ByteString aRdLine;
+ rtl::OString aRdLine;
rStrm.ReadLine( aRdLine );
// # -> comment
// ; -> delimiter between entries ->
// Format: TextToSearchFor;AlternativeString;PrimaryKey;SecondaryKey;CaseSensitive;WordOnly
// Leading and trailing blanks are ignored
- if( aRdLine.Len() && '#' != aRdLine.GetChar(0) )
+ if( aRdLine.getLength() && '#' != aRdLine[0] )
{
String sLine( aRdLine, eChrSet );
diff --git a/sw/source/core/tox/toxhlp.cxx b/sw/source/core/tox/toxhlp.cxx
index cca45d8..e283232 100644
--- a/sw/source/core/tox/toxhlp.cxx
+++ b/sw/source/core/tox/toxhlp.cxx
@@ -63,9 +63,9 @@ IndexEntrySupplierWrapper::IndexEntrySupplierWrapper()
)
{
#if OSL_DEBUG_LEVEL > 1
- ByteString aMsg( "IndexEntrySupplierWrapper: Exception caught\n" );
- aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- OSL_FAIL( aMsg.GetBuffer() );
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("IndexEntrySupplierWrapper: Exception caught\n"));
+ aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
+ OSL_FAIL( aMsg.getStr() );
#endif
}
}
@@ -89,9 +89,9 @@ String IndexEntrySupplierWrapper::GetIndexKey( const String& rTxt,
)
{
#if OSL_DEBUG_LEVEL > 1
- ByteString aMsg( "getIndexKey: Exception caught\n" );
- aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- OSL_FAIL( aMsg.GetBuffer() );
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("getIndexKey: Exception caught\n"));
+ aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
+ OSL_FAIL( aMsg.getStr() );
#endif
}
return sRet;
@@ -110,9 +110,9 @@ String IndexEntrySupplierWrapper::GetFollowingText( sal_Bool bMorePages ) const
)
{
#if OSL_DEBUG_LEVEL > 1
- ByteString aMsg( "getIndexFollowPageWord: Exception caught\n" );
- aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- OSL_FAIL( aMsg.GetBuffer() );
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("getIndexFollowPageWord: Exception caught\n"));
+ aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
+ OSL_FAIL( aMsg.getStr() );
#endif
}
return sRet;
@@ -133,9 +133,9 @@ IndexEntrySupplierWrapper::GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLc
)
{
#if OSL_DEBUG_LEVEL > 1
- ByteString aMsg( "getAlgorithmList: Exception caught\n" );
- aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- OSL_FAIL( aMsg.GetBuffer() );
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("getAlgorithmList: Exception caught\n"));
+ aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
+ OSL_FAIL( aMsg.getStr() );
#endif
}
return sRet;
@@ -156,9 +156,9 @@ sal_Bool IndexEntrySupplierWrapper::LoadAlgorithm(
)
{
#if OSL_DEBUG_LEVEL > 1
- ByteString aMsg( "loadAlgorithm: Exception caught\n" );
- aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- OSL_FAIL( aMsg.GetBuffer() );
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("loadAlgorithm: Exception caught\n"));
+ aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
+ OSL_FAIL( aMsg.getStr() );
#endif
}
return bRet;
@@ -182,9 +182,9 @@ sal_Int16 IndexEntrySupplierWrapper::CompareIndexEntry(
)
{
#if OSL_DEBUG_LEVEL > 1
- ByteString aMsg( "compareIndexEntry: Exception caught\n" );
- aMsg += ByteString( String( e.Message ), RTL_TEXTENCODING_UTF8 );
- OSL_FAIL( aMsg.GetBuffer() );
+ rtl::OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM("compareIndexEntry: Exception caught\n"));
+ aMsg.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_UTF8));
+ OSL_FAIL( aMsg.getStr() );
#endif
}
return nRet;
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index 4206c76..578a839 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -96,6 +96,7 @@
#include <docsh.hxx>
#include <fmtmeta.hxx> // MetaFieldManager
#include <switerator.hxx>
+#include <rtl/strbuf.hxx>
using ::rtl::OUString;
using namespace ::com::sun::star;
@@ -444,10 +445,10 @@ sal_Bool SwXFieldMaster::supportsService(const OUString& rServiceName) throw( un
}
if( pEntry )
{
- ByteString aTmp( RTL_CONSTASCII_STRINGPARAM(
- "com.sun.star.text.fieldmaster."));
- aTmp.Append( pEntry );
- bRet = rServiceName.equalsAsciiL(aTmp.GetBuffer(), aTmp.Len());
+ rtl::OString aTmp = rtl::OStringBuffer(RTL_CONSTASCII_STRINGPARAM(
+ "com.sun.star.text.fieldmaster.")).append(pEntry).
+ makeStringAndClear();
+ bRet = rServiceName.equalsAsciiL(aTmp.getStr(), aTmp.getLength());
}
}
return bRet;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 8a8ffca..5ba469f 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -1115,8 +1115,9 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
else if( sTmp.EqualsAscii( sGraphicObjectProtocol,
0, sizeof(sGraphicObjectProtocol)-1 ) )
{
- ByteString sId( sTmp.Copy(sizeof(sGraphicObjectProtocol)-1),
- RTL_TEXTENCODING_ASCII_US );
+ rtl::OString sId(rtl::OUStringToOString(
+ sTmp.Copy(sizeof(sGraphicObjectProtocol)-1),
+ RTL_TEXTENCODING_ASCII_US));
pGrfObj = new GraphicObject( sId );
sGrfName.Erase();
}
@@ -1184,7 +1185,9 @@ void SwXFrame::setPropertyValue(const :: OUString& rPropertyName, const :: uno::
::rtl::OUString aGraphicProtocol( RTL_CONSTASCII_USTRINGPARAM( sGraphicObjectProtocol ) );
if( aGrfUrl.compareTo( aGraphicProtocol, aGraphicProtocol.getLength() ) == 0 )
{
- ByteString sId( aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1).getStr(), RTL_TEXTENCODING_ASCII_US );
+ rtl::OString sId(rtl::OUStringToOString(
+ aGrfUrl.copy(sizeof(sGraphicObjectProtocol)-1),
+ RTL_TEXTENCODING_ASCII_US));
pGrfObj = new GraphicObject( sId );
aGraphic = pGrfObj->GetGraphic();
bApply = true;
@@ -2137,8 +2140,9 @@ void SwXFrame::attachToRange(const uno::Reference< text::XTextRange > & xTextRan
else if( sGraphicURL.EqualsAscii( sGraphicObjectProtocol,
0, sizeof(sGraphicObjectProtocol)-1 ) )
{
- ByteString sId( sGraphicURL.Copy( sizeof(sGraphicObjectProtocol)-1 ),
- RTL_TEXTENCODING_ASCII_US );
+ rtl::OString sId(rtl::OUStringToOString(
+ sGraphicURL.Copy( sizeof(sGraphicObjectProtocol)-1 ),
+ RTL_TEXTENCODING_ASCII_US));
pGrfObj = new GraphicObject( sId );
sGraphicURL.Erase();
}
diff --git a/sw/source/ui/dbui/dbmgr.cxx b/sw/source/ui/dbui/dbmgr.cxx
index 2bdd83c..a732303 100644
--- a/sw/source/ui/dbui/dbmgr.cxx
+++ b/sw/source/ui/dbui/dbmgr.cxx
@@ -1207,7 +1207,7 @@ sal_Bool SwNewDBMgr::MergeMailFiles(SwWrtShell* pSourceShell,
if(pInStream)
{
pInStream->SetStreamCharSet( eEncoding );
- ByteString sLine;
+ rtl::OString sLine;
sal_Bool bDone = pInStream->ReadLine( sLine );
while ( bDone )
{
diff --git a/sw/source/ui/dbui/mmoutputpage.cxx b/sw/source/ui/dbui/mmoutputpage.cxx
index 1c6917b..6e2e509 100644
--- a/sw/source/ui/dbui/mmoutputpage.cxx
+++ b/sw/source/ui/dbui/mmoutputpage.cxx
@@ -1248,7 +1248,7 @@ IMPL_LINK(SwMailMergeOutputPage, SendDocumentsHdl_Impl, PushButton*, pButton)
OSL_FAIL("no output file created?");
continue;
}
- ByteString sLine;
+ rtl::OString sLine;
sal_Bool bDone = pInStream->ReadLine( sLine );
while ( bDone )
{
More information about the Libreoffice-commits
mailing list