[Libreoffice-commits] .: 12 commits - cui/source editeng/qa filter/inc filter/source sd/source solenv/gbuild sw/inc sw/source tools/qa tools/source unusedcode.easy vcl/source xml2cmp/source xmloff/source xmlsecurity/source
Caolán McNamara
caolan at kemper.freedesktop.org
Mon Oct 10 01:04:25 PDT 2011
cui/source/tabpages/page.cxx | 48 --
editeng/qa/items/borderline_test.cxx | 19
filter/inc/filter/msfilter/msdffimp.hxx | 2
filter/source/msfilter/msdffimp.cxx | 2
sd/source/ui/slidesorter/controller/SlsFocusManager.cxx | 28 -
sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx | 5
solenv/gbuild/platform/unxgcc.mk | 1
sw/inc/swtypes.hxx | 1
sw/source/core/bastyp/swtypes.cxx | 1
sw/source/filter/ww8/ww8par.hxx | 2
sw/source/ui/config/uinums.cxx | 2
tools/qa/urlobj/tools_urlobj_test.cxx | 19
tools/source/stream/stream.cxx | 3
unusedcode.easy | 12
vcl/source/gdi/cvtsvm.cxx | 26 -
vcl/source/window/window.cxx | 11
xml2cmp/source/x2cclass/xml_cd.hxx | 87 ---
xml2cmp/source/x2cclass/xml_cdff.cxx | 233 ----------
xml2cmp/source/x2cclass/xml_cdff.hxx | 106 ----
xml2cmp/source/x2cclass/xml_cdim.cxx | 185 -------
xml2cmp/source/x2cclass/xml_cdim.hxx | 115 ----
xmloff/source/chart/SchXMLChartContext.cxx | 7
xmloff/source/chart/SchXMLExport.cxx | 65 +-
xmloff/source/chart/SchXMLImport.cxx | 9
xmloff/source/chart/SchXMLPlotAreaContext.cxx | 32 -
xmloff/source/core/xmlerror.cxx | 6
xmloff/source/core/xmlexp.cxx | 12
xmloff/source/core/xmlimp.cxx | 4
xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx | 8
29 files changed, 133 insertions(+), 918 deletions(-)
New commits:
commit e8bbb76827dd7a0e30d7d1db34a812a84d85f390
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 9 21:23:17 2011 +0100
ensure correct export size type in stream operation
diff --git a/editeng/qa/items/borderline_test.cxx b/editeng/qa/items/borderline_test.cxx
index 519d916..80a840c 100644
--- a/editeng/qa/items/borderline_test.cxx
+++ b/editeng/qa/items/borderline_test.cxx
@@ -48,6 +48,25 @@
using namespace editeng;
+CPPUNIT_NS_BEGIN
+
+template<> struct assertion_traits<SvxBorderStyle>
+{
+ static bool equal( const SvxBorderStyle& x, const SvxBorderStyle& y )
+ {
+ return x == y;
+ }
+
+ static std::string toString( const SvxBorderStyle& x )
+ {
+ OStringStream ost;
+ ost << static_cast<unsigned int>(x);
+ return ost.str();
+ }
+};
+
+CPPUNIT_NS_END
+
namespace {
class BorderLineTest : public CppUnit::TestFixture
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 180ff5e..0379d7c 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -82,6 +82,7 @@ gb_CXXFLAGS := \
-Wendif-labels \
-Wextra \
-Wshadow \
+ -Wsign-promo \
-Woverloaded-virtual \
-Wno-non-virtual-dtor \
-fPIC \
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index 8d85cf9..4be6ecf 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -485,7 +485,7 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
rStream << sal_uInt16(aFmt.GetNumberingType())
<< aFmt.GetBulletChar()
- << (aFmt.GetIncludeUpperLevels() > 0)
+ << static_cast<sal_Bool>(aFmt.GetIncludeUpperLevels() > 0)
<< aFmt.GetStart();
rStream.WriteByteString( aFmt.GetPrefix(), eEncoding );
rStream.WriteByteString( aFmt.GetSuffix(), eEncoding );
diff --git a/tools/qa/urlobj/tools_urlobj_test.cxx b/tools/qa/urlobj/tools_urlobj_test.cxx
index 4763c2a..da11113 100644
--- a/tools/qa/urlobj/tools_urlobj_test.cxx
+++ b/tools/qa/urlobj/tools_urlobj_test.cxx
@@ -37,6 +37,25 @@
#define OUSTR_TO_STDSTR( oustr ) std::string( rtl::OUStringToOString( oustr, RTL_TEXTENCODING_ASCII_US ).getStr() )
+CPPUNIT_NS_BEGIN
+
+template<> struct assertion_traits<INetProtocol>
+{
+ static bool equal( const INetProtocol& x, const INetProtocol& y )
+ {
+ return x == y;
+ }
+
+ static std::string toString( const INetProtocol& x )
+ {
+ OStringStream ost;
+ ost << static_cast<unsigned int>(x);
+ return ost.str();
+ }
+};
+
+CPPUNIT_NS_END
+
namespace tools_urlobj
{
commit 2d25e3c354bfed19ee5c6f596cf57eb58ead9162
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 9 11:42:02 2011 +0100
tidy this a little bit
diff --git a/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index afaa917..34dc93d 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.cxx
@@ -717,8 +717,7 @@ sal_Bool SvStream::ReadLine( ByteString& rStr )
sal_Bool SvStream::ReadLine( rtl::OString& rStr )
{
ByteString aFoo;
- sal_Bool ret;
- ret = ReadLine(aFoo);
+ sal_Bool ret = ReadLine(aFoo);
rStr = aFoo;
return ret;
}
commit 9da5c3b8e3b53c8b423febafbdc513c55525153e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 9 00:37:43 2011 +0100
callcatcher: remove some unused code
diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
index 23f2935..3256690 100644
--- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx
@@ -318,34 +318,6 @@ void FocusManager::RemoveFocusChangeListener (const Link& rListener)
::std::find (maFocusChangeListeners.begin(), maFocusChangeListeners.end(), rListener));
}
-
-
-
-void FocusManager::SetFocusToToolBox (void)
-{
- HideFocus();
-
- if (mrSlideSorter.GetViewShell() != NULL)
- {
- ::Window* pParentWindow = mrSlideSorter.GetViewShell()->GetParentWindow();
- DockingWindow* pDockingWindow = NULL;
- while (pParentWindow!=NULL && pDockingWindow==NULL)
- {
- pDockingWindow = dynamic_cast<DockingWindow*>(pParentWindow);
- pParentWindow = pParentWindow->GetParent();
- }
- if (pDockingWindow)
- {
- PaneDockingWindow* pPaneDockingWindow = dynamic_cast<PaneDockingWindow*>(pDockingWindow);
- if (pPaneDockingWindow != NULL)
- pPaneDockingWindow->GetToolBox().GrabFocus();
- }
- }
-}
-
-
-
-
void FocusManager::NotifyFocusChangeListeners (void) const
{
// Create a copy of the listener list to be safe when that is modified.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
index d077e64..48f0306 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsFocusManager.hxx
@@ -162,11 +162,6 @@ public:
*/
void RemoveFocusChangeListener (const Link& rListener);
- /** Move focus to sibling outside the actual slide sorter. This is
- typically the tool bar with the close button.
- */
- void SetFocusToToolBox (void);
-
/** Create an instance of this class to temporarily hide the focus
indicator. It is restored to its former visibility state when the
FocusHider is destroyed.
diff --git a/unusedcode.easy b/unusedcode.easy
index 4be3363..60435c0 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -2650,7 +2650,6 @@ sd::slidesorter::controller::Animator::AddInfiniteAnimation(boost::function1<voi
sd::slidesorter::controller::Clipboard::SelectPages()
sd::slidesorter::controller::DragAndDropContext::GetPagesFromBookmarks(std::vector<SdPage const*, std::allocator<SdPage const*> >&, int&, sd::DrawDocShell*, List const&) const
sd::slidesorter::controller::DragAndDropContext::GetPagesFromSelection(std::vector<SdPage const*, std::allocator<SdPage const*> >&, int&, sd::slidesorter::model::PageEnumeration&) const
-sd::slidesorter::controller::FocusManager::SetFocusToToolBox()
sd::slidesorter::controller::PageSelector::DeselectPage(SdPage const*, bool)
sd::slidesorter::controller::Properties::SetOnlyPreviewTriggersMouseOver(bool)
sd::slidesorter::controller::ScrollBarManager::GetLeft() const
commit 7404c81ee11d99e8ce8dbc3dc777ada5ae38046f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 9 00:03:08 2011 +0100
update unused list
diff --git a/unusedcode.easy b/unusedcode.easy
index b11938d..4be3363 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1878,6 +1878,7 @@ binfilter::SwRects::Replace(binfilter::SwRect const*, unsigned short, unsigned s
binfilter::SwRects::SwRects(unsigned short, unsigned char)
binfilter::SwRects::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SwRect const&, void*), void*)
binfilter::SwRubyList::DeleteAndDestroy(unsigned short, unsigned short)
+binfilter::SwSelBoxes::Insert(binfilter::SwSelBoxes const*, unsigned short, unsigned short)
binfilter::SwSelBoxes::Insert(binfilter::SwTableBox* const&, unsigned short&)
binfilter::SwSelBoxes::Remove(binfilter::SwTableBox* const&, unsigned short)
binfilter::SwSortDrawObjs::DeleteAndDestroy(unsigned short, unsigned short)
commit 6d768ffb800613b71388bc4804a797d7537cc2b8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sun Oct 9 00:02:52 2011 +0100
ByteString->rtl::OString
diff --git a/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index b09e9d4..69579c9 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.cxx
@@ -249,8 +249,9 @@ void ImplWriteFont( SvStream& rOStm, const Font& rFont,
char aName[32];
short nWeight;
- ByteString aByteName( rFont.GetName(), rOStm.GetStreamCharSet() );
- strncpy( aName, aByteName.GetBuffer(), 32 );
+ rtl::OString aByteName(rtl::OUStringToOString(rFont.GetName(),
+ rOStm.GetStreamCharSet()));
+ strncpy( aName, aByteName.getStr(), 32 );
switch ( rFont.GetWeight() )
{
@@ -1718,8 +1719,9 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaTextAction* pAct = (MetaTextAction*) pAction;
String aUniText( pAct->GetText() );
- ByteString aText( aUniText, rActualCharSet );
- const sal_uLong nStrLen = aText.Len();
+ rtl::OString aText(rtl::OUStringToOString(aUniText,
+ rActualCharSet));
+ const sal_uLong nStrLen = aText.getLength();
if ( ImplWriteUnicodeComment( rOStm, aUniText ) )
nCount++;
@@ -1730,7 +1732,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
rOStm << (sal_Int32) pAct->GetIndex();
rOStm << (sal_Int32) pAct->GetLen();
rOStm << (sal_Int32) nStrLen;
- rOStm.Write( aText.GetBuffer(), nStrLen + 1 );
+ rOStm.Write( aText.getStr(), nStrLen + 1 );
nCount++;
}
break;
@@ -1738,11 +1740,12 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
case( META_TEXTARRAY_ACTION ):
{
MetaTextArrayAction* pAct = (MetaTextArrayAction*)pAction;
- ByteString aText( pAct->GetText(), rActualCharSet );
+ rtl::OString aText(rtl::OUStringToOString(pAct->GetText(),
+ rActualCharSet));
String aUniText( pAct->GetText(), pAct->GetIndex(), pAct->GetLen() );
sal_uLong nAryLen;
sal_uLong nLen = pAct->GetLen();
- const sal_uLong nTextLen = aText.Len();
+ const sal_uLong nTextLen = aText.getLength();
sal_Int32* pDXArray = pAct->GetDXArray();
if ( ImplWriteUnicodeComment( rOStm, aUniText ) )
@@ -1768,7 +1771,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
rOStm << (sal_Int32) nLen;
rOStm << (sal_Int32) nLen;
rOStm << (sal_Int32) nAryLen;
- rOStm.Write( aText.GetBuffer()+pAct->GetIndex(), nLen + 1 );
+ rOStm.Write( aText.getStr()+pAct->GetIndex(), nLen + 1 );
for( sal_uLong n = 0UL ; n < nAryLen; n++ )
rOStm << (sal_Int32) pDXArray[ n ];
@@ -1781,8 +1784,9 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
{
MetaStretchTextAction* pAct = (MetaStretchTextAction*) pAction;
String aUniText( pAct->GetText() );
- ByteString aText( aUniText, rActualCharSet );
- const sal_uLong nStrLen = aText.Len();
+ rtl::OString aText(rtl::OUStringToOString(aUniText,
+ rActualCharSet));
+ const sal_uLong nStrLen = aText.getLength();
if ( ImplWriteUnicodeComment( rOStm, aUniText ) )
nCount++;
@@ -1794,7 +1798,7 @@ sal_uLong SVMConverter::ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf,
rOStm << (sal_Int32) pAct->GetLen();
rOStm << (sal_Int32) nStrLen;
rOStm << (sal_Int32) pAct->GetWidth();
- rOStm.Write( aText.GetBuffer(), nStrLen + 1 );
+ rOStm.Write( aText.getStr(), nStrLen + 1 );
nCount++;
}
break;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index debf6e2..8c974e7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -4486,11 +4486,12 @@ Window::~Window()
// #122232#, this must not happen and is an application bug ! but we try some cleanup to hopefully avoid crashes, see below
bHasFocussedChild = sal_True;
#if OSL_DEBUG_LEVEL > 0
- ByteString aTempStr( "Window (" );
- aTempStr += ByteString( GetText(), RTL_TEXTENCODING_UTF8 );
- aTempStr += ") with focussed child window destroyed ! THIS WILL LEAD TO CRASHES AND MUST BE FIXED !";
- OSL_FAIL( aTempStr.GetBuffer() );
- GetpApp()->Abort( String( aTempStr, RTL_TEXTENCODING_UTF8 ) ); // abort in non-pro version, this must be fixed!
+ rtl::OStringBuffer aTempStr("Window (");
+ aTempStr.append(rtl::OUStringToOString(GetText(),
+ RTL_TEXTENCODING_UTF8)).
+ append(") with focussed child window destroyed ! THIS WILL LEAD TO CRASHES AND MUST BE FIXED !");
+ OSL_FAIL( aTempStr.getStr() );
+ GetpApp()->Abort(rtl::OStringToOUString(aTempStr.makeStringAndClear(), RTL_TEXTENCODING_UTF8 )); // abort in non-pro version, this must be fixed!
#endif
}
commit 307263ec54cff27b8a61d55ede931c083af90381
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 8 22:11:45 2011 +0100
remove unused source dir
diff --git a/xml2cmp/source/x2cclass/xml_cd.hxx b/xml2cmp/source/x2cclass/xml_cd.hxx
deleted file mode 100644
index 9f59aa4..0000000
--- a/xml2cmp/source/x2cclass/xml_cd.hxx
+++ /dev/null
@@ -1,87 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef UDKSERVICE_XML_CD_HXX
-#define UDKSERVICE_XML_CD_HXX
-
-
-#include <tools/string.hxx>
-#include <vector>
-
-
-
-/** Represents one Component description from an XML file.
- DatumOf() is used for tags with only one value.
- DataOf() is used, if the tag has multiple values or if
- you don't know.
-**/
-class ComponentDescription
-{
- public:
- /** @ATTENTION
- Because the enum values are used as array indices:
- tag_None must be the first and have the value "0".
- tag_MAX must be the last.
- The enum values must not be assigned numbers.
- **/
- enum E_Tag
- {
- tag_None = 0,
- tag_Name,
- tag_Description,
- tag_ModuleName,
- tag_LoaderName,
- tag_SupportedService,
- tag_ProjectBuildDependency,
- tag_RuntimeModuleDependency,
- tag_ServiceDependency,
- tag_Language,
- tag_Status,
- tag_Type,
- tag_MAX
- };
-
- virtual ~ComponentDescription() {}
-
- /// @return All values of this tag. An empty vector for wrong indices.
- virtual const std::vector< ByteString > &
- DataOf(
- ComponentDescription::E_Tag
- i_eTag ) const = 0;
-
- /// @return The only or the first value of this tag. An empty string for wrong indices.
- virtual ByteString DatumOf(
- ComponentDescription::E_Tag
- i_eTag ) const = 0;
-};
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/x2cclass/xml_cdff.cxx b/xml2cmp/source/x2cclass/xml_cdff.cxx
deleted file mode 100644
index 8382733..0000000
--- a/xml2cmp/source/x2cclass/xml_cdff.cxx
+++ /dev/null
@@ -1,233 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "xml_cdff.hxx"
-
-#include <string.h>
-#include <tools/stream.hxx>
-#include "xml_cdim.hxx"
-#include <ctype.h>
-
-
-typedef ComponentDescriptionImpl::ValueList CdiValueList;
-
-class dyn_buffer
-{
- public:
- dyn_buffer() : s(0) {}
- ~dyn_buffer() { if (s) delete [] s; }
- operator const char *() const { return s; }
- char * operator->() { return s; }
- char & operator[](
- INT32 ix ) { return s[ix]; }
- void SetSize(
- INT32 i_size ) { if (s) delete [] s; s = new char [i_size]; }
- private:
- char * s;
-};
-
-
-inline BOOL
-LoadXmlFile( dyn_buffer & o_rBuffer,
- const UniString & i_sXmlFilePath )
-{
- BOOL ret = TRUE;
- SvFileStream aXmlFile;
-
- aXmlFile.Open(i_sXmlFilePath, STREAM_READ);
- if (aXmlFile.GetErrorCode() != FSYS_ERR_OK)
- ret = FALSE;
- if (ret)
- {
- aXmlFile.Seek(STREAM_SEEK_TO_END);
- INT32 nBufferSize = aXmlFile.Tell();
- o_rBuffer.SetSize(nBufferSize + 1);
- o_rBuffer[nBufferSize] = '\0';
- aXmlFile.Seek(0);
- if (aXmlFile.Read(o_rBuffer.operator->(), nBufferSize) == 0)
- ret = FALSE;
- }
-
- aXmlFile.Close();
- return ret;
-}
-
-
-
-CompDescrsFromAnXmlFile::CompDescrsFromAnXmlFile()
- : dpDescriptions(new std::vector< ComponentDescriptionImpl* >),
- eStatus(not_yet_parsed)
-{
- dpDescriptions->reserve(3);
-}
-
-CompDescrsFromAnXmlFile::~CompDescrsFromAnXmlFile()
-{
- Empty();
- delete dpDescriptions;
-}
-
-
-BOOL
-CompDescrsFromAnXmlFile::Parse( const UniString & i_sXmlFilePath )
-{
- dyn_buffer dpBuffer;
-
- if (! LoadXmlFile(dpBuffer,i_sXmlFilePath) )
- {
- eStatus = cant_read_file;
- return FALSE;
- }
-
- const char * pTokenStart = 0;
- const char * pBufferPosition = dpBuffer;
- INT32 nTokenLength = 0;
- BOOL bWithinElement = FALSE;
-
- CdiValueList * pCurTagData = 0;
- ByteString sStatusValue; // Used only if a <Status ...> tag is found.
-
-
- for ( ComponentDescriptionImpl::ParseUntilStartOfDescription(pBufferPosition);
- pBufferPosition != 0;
- ComponentDescriptionImpl::ParseUntilStartOfDescription(pBufferPosition) )
- {
- ComponentDescriptionImpl * pCurCD = 0;
- pCurCD = new ComponentDescriptionImpl;
- dpDescriptions->push_back(pCurCD);
-
- for ( ; *pBufferPosition != '\0' && pCurCD != 0; )
- {
- switch (*pBufferPosition)
- {
- case '<' :
- if (! bWithinElement)
- {
- pCurTagData = pCurCD->GetBeginTag(sStatusValue, pBufferPosition);
- if (pCurTagData != 0)
- {
- if (sStatusValue.Len () == 0)
- {
- // Start new token:
- pTokenStart = pBufferPosition;
- nTokenLength = 0;
- bWithinElement = TRUE;;
- }
- else
- {
- // Status tag is already parsed:
- pCurTagData->push_back(sStatusValue);
- } // endif (sStatusValue.Length () == 0)
- }
- else if ( ComponentDescriptionImpl::CheckEndOfDescription(pBufferPosition) )
- {
- pBufferPosition += ComponentDescriptionImpl::DescriptionEndTagSize();
- pCurCD = 0;
- }
- else
- {
- eStatus = inconsistent_file;
- return FALSE;
- } // endif (pCurTagData != 0) elseif() else
- }
- else if ( pCurTagData->MatchesEndTag(pBufferPosition) )
- {
- // Finish token:
- pBufferPosition += pCurTagData->EndTagLength();
- bWithinElement = FALSE;
-
- // Remove leading and trailing spaces:
- while ( isspace(*pTokenStart) )
- {
- pTokenStart++;
- nTokenLength--;
- }
- while ( nTokenLength > 0
- && isspace(pTokenStart[nTokenLength-1]) )
- {
- nTokenLength--;
- }
- // Add token to tag values list.
- pCurTagData->push_back(ByteString(pTokenStart,nTokenLength));
- }
- else
- {
- nTokenLength++;
- ++pBufferPosition;
- } // endif (!bWithinElement) else if () else
- break;
- default:
- if (bWithinElement)
- {
- ++nTokenLength;
- }
- ++pBufferPosition;
- } // end switch
- } // end for
-
- if (bWithinElement)
- {
- eStatus = inconsistent_file;
- return FALSE;
- }
- } // end for
-
- return TRUE;
-}
-
-INT32
-CompDescrsFromAnXmlFile::NrOfDescriptions() const
-{
- return dpDescriptions->size();
-}
-
-const ComponentDescription &
-CompDescrsFromAnXmlFile::operator[](INT32 i_nIndex) const
-{
- static const ComponentDescriptionImpl aNullDescr_;
- return 0 <= i_nIndex && i_nIndex < dpDescriptions->size()
- ? *(*dpDescriptions)[i_nIndex]
- : aNullDescr_;
-}
-
-void
-CompDescrsFromAnXmlFile::Empty()
-{
- for ( std::vector< ComponentDescriptionImpl* >::iterator aIter = dpDescriptions->begin();
- aIter != dpDescriptions->end();
- ++aIter )
- {
- delete *aIter;
- }
- dpDescriptions->erase( dpDescriptions->begin(),
- dpDescriptions->end() );
-}
-
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/x2cclass/xml_cdff.hxx b/xml2cmp/source/x2cclass/xml_cdff.hxx
deleted file mode 100644
index 6616abb..0000000
--- a/xml2cmp/source/x2cclass/xml_cdff.hxx
+++ /dev/null
@@ -1,106 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef UDKSERVICE_XML_CDFF_HXX
-#define UDKSERVICE_XML_CDFF_HXX
-
-
-#include <tools/string.hxx>
-#include "xml_cd.hxx"
-
-class ComponentDescriptionImpl;
-
-
-/** @descr
- Is able to parse an XML file with Component descriptions. Gives access
- to the parsed data.
-
- Use:
- CompDescrsFromAnXmlFile aCds;
- UniString aFilepath(...);
- if (! aCds.Parse(aFilepath) )
- {
- // react on:
- aCds.Status();
- }
-
- With operator[] you get access to ComponentDescriptions
- on indices 0 to NrOfDescriptions()-1 .
-
- For further handling see class ComponentDescription
- in xml_cd.hxx .
-
- It is possible to parse more than one time. Then the old data
- are discarded.
-**/
-class CompDescrsFromAnXmlFile
-{
- public:
- enum E_Status
- {
- ok = 0,
- not_yet_parsed,
- cant_read_file,
- inconsistent_file,
- no_tag_found_in_file
- };
-
- // LIFECYCLE
- CompDescrsFromAnXmlFile();
- ~CompDescrsFromAnXmlFile();
-
- // OPERATIONS
- BOOL Parse(
- const UniString & i_sXmlFilePath );
-
- // INQUIRY
- INT32 NrOfDescriptions() const;
- const ComponentDescription &
- operator[]( /// @return an empty description, if index does not exist.
- INT32 i_nIndex ) const;
- CompDescrsFromAnXmlFile::E_Status
- Status() const;
-
- private:
- // PRIVATE SERVICES
- void Empty();
-
- // DATA
- std::vector< ComponentDescriptionImpl* > *
- dpDescriptions;
- E_Status eStatus;
-};
-
-
-
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/x2cclass/xml_cdim.cxx b/xml2cmp/source/x2cclass/xml_cdim.cxx
deleted file mode 100644
index ed9bc1b..0000000
--- a/xml2cmp/source/x2cclass/xml_cdim.cxx
+++ /dev/null
@@ -1,185 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#include "xml_cdim.hxx"
-
-const char ComponentDescriptionImpl::C_sTagDescription[]
- = "COMPONENTDESCRIPTION";
-const char ComponentDescriptionImpl::C_sStatus[]
- = "Status";
-const char * ComponentDescriptionImpl::C_sSubTags[ComponentDescription::tag_MAX]
- = { "None",
- "Name",
- "Description",
- "ModuleName",
- "LoaderName",
- "SupportedService",
- "ProjectBuildDependency",
- "RuntimeModuleDependency",
- "ServiceDependency",
- "Language",
- C_sStatus,
- "Type"
- };
-
-ComponentDescriptionImpl::ComponentDescriptionImpl()
-// : aTags
-{
- const int i_max = tag_MAX;
- aTags.reserve(i_max);
-
- for (int i = 0; i < i_max; ++i)
- {
- aTags.push_back( new ValueList(E_Tag(i)) );
- } // end for
-}
-
-ComponentDescriptionImpl::~ComponentDescriptionImpl()
-{
- for ( std::vector< ValueList* >::iterator aIter = aTags.begin();
- aIter != aTags.end();
- ++aIter )
- {
- delete *aIter;
- }
-}
-
-inline void
-GetStatusValue( ByteString & o_sValue, const ByteString & i_sStatusTag )
-{
- // o_sValue is always == "" at the beginning.
-
- const char * pStatusValue = strchr(i_sStatusTag.GetBuffer(), '"');
- if (pStatusValue == 0)
- return;
- pStatusValue++;
- const char * pStatusValueEnd = strrchr(pStatusValue,'"');
- if (pStatusValueEnd == 0 || pStatusValueEnd - pStatusValue < 1)
- return ;
-
- ByteString sValue(pStatusValue, pStatusValueEnd - pStatusValue);
- o_sValue = sValue;
-}
-
-ComponentDescriptionImpl::ValueList *
-ComponentDescriptionImpl::GetBeginTag( ByteString & o_sValue,
- const char *& io_pStartOfTag ) const
-{
- o_sValue = "";
-
- const char * pCurTextEnd = strchr(io_pStartOfTag,'>');
- if ( 0 == pCurTextEnd )
- return 0;
-
- if ( ComponentDescriptionImpl::CheckEndOfDescription(io_pStartOfTag) )
- return 0;
-
- ByteString sTag(io_pStartOfTag + 1, pCurTextEnd - io_pStartOfTag - 1);
- io_pStartOfTag += sTag.Len() + 2;
-
- // Special case <Status ... >
- if ( strnicmp(C_sStatus, sTag.GetBuffer(), (sizeof C_sStatus) - 1 ) == 0 )
- {
- GetStatusValue(o_sValue,sTag);
- return aTags[tag_Status];
- }
-
- // Regular seeking for matching data list:
- for ( INT32 i = 0; i < tag_MAX; i++ )
- {
- if ( 0 == stricmp(sTag.GetBuffer(), C_sSubTags[i]) )
- return aTags[i];
- } // end for
-
- return 0;
-}
-
-const std::vector< ByteString > &
-ComponentDescriptionImpl::DataOf( ComponentDescriptionImpl::E_Tag i_eTag ) const
-{
- if (0 < i_eTag && i_eTag < tag_MAX)
- return *aTags[i_eTag];
- else
- return ValueList::Null_();
-}
-
-ByteString
-ComponentDescriptionImpl::DatumOf( ComponentDescriptionImpl::E_Tag i_eTag ) const
-{
- if (0 < i_eTag && i_eTag < tag_MAX)
- {
- ValueList & rValues = *aTags[i_eTag];
- if (rValues.size() > 0)
- return rValues[0];
- }
- return "";
-}
-
-void
-ComponentDescriptionImpl::ParseUntilStartOfDescription( const char * & io_pBufferPosition )
-{
- for ( const char * pSearch = strchr(io_pBufferPosition,'<');
- pSearch != 0;
- pSearch = strchr(pSearch+1,'<') )
- {
- if ( pSearch != io_pBufferPosition
- && 0 == strnicmp(pSearch+1,C_sTagDescription, strlen(C_sTagDescription))
- && *(pSearch + strlen(C_sTagDescription) + 1) == '>' )
- {
- io_pBufferPosition = pSearch + strlen(C_sTagDescription) + 2;
- return;
- }
- } // end for
-
- io_pBufferPosition = 0;
-}
-
-BOOL
-ComponentDescriptionImpl::ValueList::MatchesEndTag( const char * i_pTextPosition ) const
-{
- return strnicmp( i_pTextPosition+2, C_sSubTags[eTag], strlen(C_sSubTags[eTag]) ) == 0
- && strncmp(i_pTextPosition,"</",2) == 0
- && *(i_pTextPosition + 2 + strlen(C_sSubTags[eTag]) ) == '>';
-}
-
-INT32
-ComponentDescriptionImpl::ValueList::EndTagLength() const
-{
- return strlen(C_sSubTags[eTag]) + 3;
-}
-
-
-const ComponentDescriptionImpl::ValueList &
-ComponentDescriptionImpl::ValueList::Null_()
-{
- static const ValueList aNull_(ComponentDescription::tag_None);
- return aNull_;
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xml2cmp/source/x2cclass/xml_cdim.hxx b/xml2cmp/source/x2cclass/xml_cdim.hxx
deleted file mode 100644
index c9a0d65..0000000
--- a/xml2cmp/source/x2cclass/xml_cdim.hxx
+++ /dev/null
@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef UDKSERVICE_XML_CDIM_HXX
-#define UDKSERVICE_XML_CDIM_HXX
-
-
-#include "xml_cd.hxx"
-#include <tools/string.hxx>
-
-
-
-
-
-/** Represents one of the Component descriptions in an XML file.
- Implements ComponentDescription and does part of the parsing for class CompDescrsFromAnXmlFile.
-**/
-class ComponentDescriptionImpl : public ComponentDescription
-{
- public:
- class ValueList : public std::vector< ByteString >
- {
- public:
- // LIFECYCLE
- ValueList(
- E_Tag i_eTag )
- : eTag(i_eTag) {}
- // INQUIRY
- const char * BeginTag() const;
- BOOL MatchesEndTag(
- const char * i_pTextPosition ) const;
- INT32 EndTagLength() const;
-
- static const ValueList &
- Null_();
- private:
- E_Tag eTag;
- };
-
- // LIFECYCLE
- ComponentDescriptionImpl();
- virtual ~ComponentDescriptionImpl();
-
- // OPERATIONS
- ValueList * GetBeginTag(
- ByteString & o_sValue,
- const char * & io_pStartOfTag ) const;
- static void ParseUntilStartOfDescription(
- const char * & io_pBufferPosition );
- static BOOL CheckEndOfDescription(
- const char * & io_pBufferPosition );
- // INQUIRY
- static INT32 DescriptionEndTagSize();
-
- // INTERFACE ComponentDescription
- // INQUIRY
- virtual const std::vector< ByteString > &
- DataOf( /// @return All values of this tag.
- ComponentDescription::E_Tag
- i_eTag ) const;
- virtual ByteString DatumOf( /// @return The only or the first value of this tag.
- ComponentDescription::E_Tag
- i_eTag ) const;
- private:
- // DATA
- static const char C_sTagDescription[];
- static const char C_sStatus[];
- static const char * C_sSubTags[ComponentDescription::tag_MAX];
- friend class ValueList;
-
- std::vector< ValueList* > // Dynamic allocated pointers.
- aTags;
-};
-
-
-inline BOOL
-ComponentDescriptionImpl::CheckEndOfDescription( const char * & io_pBufferPosition )
- { return strnicmp(io_pBufferPosition + 2, C_sTagDescription, strlen(C_sTagDescription)) == 0
- && strncmp(io_pBufferPosition, "</", 2) == 0
- && * (io_pBufferPosition + 2 + strlen(C_sTagDescription)) == '>'; }
-
-inline INT32
-ComponentDescriptionImpl::DescriptionEndTagSize()
- { return strlen(C_sTagDescription) + 3; }
-
-
-#endif
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit af6980b1c7ed24d9102e5a88c095aa8fb4008715
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 8 22:01:21 2011 +0100
make xmloff ByteString free
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index fd245ac..96d04db 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -40,8 +40,6 @@
#include "SchXMLTools.hxx"
#include <comphelper/mediadescriptor.hxx>
#include <tools/debug.hxx>
-// header for class ByteString
-#include <tools/string.hxx>
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmlement.hxx>
#include <xmloff/xmltoken.hxx>
@@ -175,9 +173,8 @@ void lcl_removeEmptyChartTypeGroups( const uno::Reference< chart2::XChartDocumen
}
catch(const uno::Exception& ex)
{
- String aStr( ex.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Exception caught while removing empty chart types: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(ex.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Exception caught while removing empty chart types: %s", aBStr.getStr());
}
}
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index df497d0..f3c1534 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -299,8 +299,9 @@ Reference< uno::XComponentContext > lcl_getComponentContext()
if( xFactProp.is())
xFactProp->getPropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext;
}
- catch( uno::Exception& )
- {}
+ catch( const uno::Exception& )
+ {
+ }
return xContext;
}
@@ -377,7 +378,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_getCategories( const Referen
}
}
}
- catch( uno::Exception & ex )
+ catch( const uno::Exception & ex )
{
(void)ex; // avoid warning for pro build
OSL_FAIL( OUStringToOString(
@@ -495,7 +496,7 @@ bool lcl_isSeriesAttachedToFirstAxis(
xProp->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("AttachedAxisIndex") ) ) >>= nAxisIndex;
bResult = (0==nAxisIndex);
}
- catch( uno::Exception & ex )
+ catch( const uno::Exception & ex )
{
(void)ex; // avoid warning for pro build
OSL_FAIL( OUStringToOString(
@@ -720,9 +721,8 @@ bool lcl_SequenceHasUnhiddenData( const uno::Reference< chart2::data::XDataSeque
if( !aHiddenValues.getLength() )
return true;
}
- catch( uno::Exception& e )
+ catch( const uno::Exception& )
{
- (void)e; // avoid warning
return true;
}
}
@@ -942,7 +942,7 @@ lcl_TableData lcl_getDataForLocalTable(
rTarget[i] = uno::makeAny( rSource[i] );
}
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE( OUStringToOString( OUString( RTL_CONSTASCII_USTRINGPARAM(
@@ -993,12 +993,11 @@ void lcl_exportNumberFormat( const OUString& rPropertyName, const Reference< bea
}
}
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
#ifdef DBG_UTIL
- String aStr( rEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "chart:exporting error bar ranges: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "chart:exporting error bar ranges: %s", aBStr.getStr());
#else
(void)rEx; // avoid warning
#endif
@@ -1266,7 +1265,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
aAny >>= aNullDate;
}
}
- catch( beans::UnknownPropertyException & )
+ catch( const beans::UnknownPropertyException & )
{
DBG_WARNING( "Required property not found in ChartDocument" );
}
@@ -1478,7 +1477,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
if( SchXMLEnumConverter::getLegendPositionConverter().exportXML( msString, aAny, mrExport.GetMM100UnitConverter() ) )
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_LEGEND_POSITION, msString );
}
- catch( beans::UnknownPropertyException & )
+ catch( const beans::UnknownPropertyException & )
{
DBG_WARNING( "Property Align not found in ChartLegend" );
}
@@ -1510,7 +1509,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
}
}
}
- catch( beans::UnknownPropertyException & )
+ catch( const beans::UnknownPropertyException & )
{
DBG_WARNING( "Property Expansion not found in ChartLegend" );
}
@@ -1572,7 +1571,7 @@ void SchXMLExportHelper_Impl::parseDocument( Reference< chart::XChartDocument >&
Any aShapesAny = xDocPropSet->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM( "AdditionalShapes" )));
aShapesAny >>= mxAdditionalShapes;
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE(
@@ -1667,7 +1666,7 @@ void SchXMLExportHelper_Impl::exportTable()
mrExport.AddAttribute( XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TRUE );
}
}
- catch ( uno::Exception& )
+ catch ( const uno::Exception& )
{
}
@@ -2003,7 +2002,7 @@ void SchXMLExportHelper_Impl::exportPlotArea(
: ::xmloff::token::GetXMLToken( ::xmloff::token::XML_ROW )));
}
}
- catch( beans::UnknownPropertyException & )
+ catch( const beans::UnknownPropertyException & )
{
DBG_ERRORFILE( "Properties missing" );
}
@@ -2030,12 +2029,11 @@ void SchXMLExportHelper_Impl::exportPlotArea(
mrExport.AddAttribute( XML_NAMESPACE_CHART, XML_TABLE_NUMBER_LIST, msTableNumberList );
}
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
#ifdef DBG_UTIL
- String aStr( rEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "chart:TableNumberList property caught: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE("chart:TableNumberList property caught: %s", aBStr.getStr());
#else
(void)rEx; // avoid warning
#endif
@@ -2067,12 +2065,11 @@ void SchXMLExportHelper_Impl::exportPlotArea(
rShapeExport->export3DSceneAttributes( xPropSet );
}
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
#ifdef DBG_UTIL
- String aStr( rEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "chart:exportPlotAreaException caught: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "chart:exportPlotAreaException caught: %s", aBStr.getStr());
#else
(void)rEx; // avoid warning
#endif
@@ -2789,7 +2786,7 @@ void SchXMLExportHelper_Impl::exportSeries(
xPropSet = SchXMLSeriesHelper::createOldAPISeriesPropertySet(
aSeriesSeq[nSeriesIdx], mrExport.GetModel() );
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE(
@@ -2825,7 +2822,7 @@ void SchXMLExportHelper_Impl::exportSeries(
OUString( RTL_CONSTASCII_USTRINGPARAM( "ErrorBarStyle" )));
aAny >>= nErrorBarStyle;
}
- catch( beans::UnknownPropertyException & rEx )
+ catch( const beans::UnknownPropertyException & rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE(
@@ -2961,7 +2958,7 @@ void SchXMLExportHelper_Impl::exportSeries(
OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMeanValueProperties" ))));
aPropAny >>= xStatProp;
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE( "Exception caught during Export of series - optional DataMeanValueProperties not available: %s",
@@ -3009,7 +3006,7 @@ void SchXMLExportHelper_Impl::exportSeries(
OUString( RTL_CONSTASCII_USTRINGPARAM( "DataErrorProperties" ))));
aPropAny >>= xStatProp;
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE( "Exception caught during Export of series - optional DataErrorProperties not available: %s",
@@ -3085,7 +3082,7 @@ void SchXMLExportHelper_Impl::exportRegressionCurve(
OUString( RTL_CONSTASCII_USTRINGPARAM( "DataRegressionProperties" ))));
aPropAny >>= xStatProp;
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE( "Exception caught during Export of series - optional DataRegressionProperties not available: %s",
@@ -3356,7 +3353,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
xSeries, nElement, mrExport.GetModel() );
bExportNumFmt = true;
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE( "Exception caught during Export of data point: %s",
@@ -3432,7 +3429,7 @@ void SchXMLExportHelper_Impl::exportDataPoints(
xPropSet = SchXMLSeriesHelper::createOldAPIDataPointPropertySet(
xSeries, nCurrIndex, mrExport.GetModel() );
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
(void)rEx; // avoid warning for pro build
OSL_TRACE( "Exception caught during Export of data point: %s",
@@ -3735,7 +3732,7 @@ void SchXMLExport::_ExportContent()
// do not include own table if there are external addresses
bIncludeTable = (sChartAddress.getLength() == 0);
}
- catch( beans::UnknownPropertyException & )
+ catch( const beans::UnknownPropertyException & )
{
OSL_FAIL( "Property ChartRangeAddress not supported by ChartDocument" );
}
@@ -3812,7 +3809,7 @@ void SchXMLExportHelper_Impl::InitRangeSegmentationProperties( const Reference<
}
}
}
- catch( uno::Exception & ex )
+ catch( const uno::Exception & ex )
{
(void)ex; // avoid warning for pro build
OSL_FAIL( OUStringToOString(
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 387f3a4..6643b8a 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -37,8 +37,6 @@
#include <tools/debug.hxx>
#include <rtl/ustrbuf.hxx>
-// header for class ByteString
-#include <tools/string.hxx>
#include <comphelper/processfactory.hxx>
#include "xmloff/xmlnmspe.hxx"
#include <xmloff/xmltoken.hxx>
@@ -775,12 +773,11 @@ void SAL_CALL SchXMLImport::setTargetDocument( const uno::Reference< lang::XComp
xChartDoc->createInternalDataProvider( sal_False );
}
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
#ifdef DBG_UTIL
- String aStr( rEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "SchXMLChartContext::StartElement(): Exception caught: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE("SchXMLChartContext::StartElement(): Exception caught: %s", aBStr.getStr());
#else
(void)rEx; // avoid warning for pro build
#endif
diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
index 4128896..249b1d5 100644
--- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx
+++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx
@@ -127,12 +127,11 @@ void SchXML3DSceneAttributesHelper::getCameraDefaultFromDiagram( const uno::Refe
maVUP.setZ( aCamGeo.vup.DirectionZ );
}
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
#ifdef DBG_UTIL
- String aStr( rEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Exception caught for property NumberOfLines: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Exception caught for property NumberOfLines: %s", aBStr.getStr());
#else
(void)rEx; // avoid warning for pro build
#endif
@@ -240,7 +239,7 @@ SchXMLPlotAreaContext::SchXMLPlotAreaContext(
aAny <<= eSource;
xProp->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataRowSource" )), aAny );
}
- catch( beans::UnknownPropertyException & )
+ catch( const beans::UnknownPropertyException & )
{
OSL_FAIL( "Property required by service not supported" );
}
@@ -324,7 +323,7 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "DataSourceLabelsInFirstRow" )),
aAny );
}
- catch( beans::UnknownPropertyException & )
+ catch( const beans::UnknownPropertyException & )
{
DBG_ERRORFILE( "Properties missing" );
}
@@ -432,12 +431,11 @@ void SchXMLPlotAreaContext::StartElement( const uno::Reference< xml::sax::XAttri
xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NumberOfLines"))) >>= mnNumOfLinesProp;
xProp->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Volume"))) >>= mbStockHasVolume;
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
#ifdef DBG_UTIL
- String aStr( rEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "PlotAreaContext:EndElement(): Exception caught: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE("PlotAreaContext:EndElement(): Exception caught: %s", aBStr.getStr());
#else
(void)rEx; // avoid warning for pro build
#endif
@@ -609,12 +607,11 @@ void SchXMLPlotAreaContext::EndElement()
xDiaProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NumberOfLines" )),
uno::makeAny( mnNumOfLinesProp ));
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
#ifdef DBG_UTIL
- String aStr( rEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Exception caught for property NumberOfLines: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE( "Exception caught for property NumberOfLines: %s", aBStr.getStr());
#else
(void)rEx; // avoid warning for pro build
#endif
@@ -631,12 +628,11 @@ void SchXMLPlotAreaContext::EndElement()
xDiaProp->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Volume" )),
uno::makeAny( true ));
}
- catch( uno::Exception & rEx )
+ catch( const uno::Exception & rEx )
{
#ifdef DBG_UTIL
- String aStr( rEx.Message );
- ByteString aBStr( aStr, RTL_TEXTENCODING_ASCII_US );
- OSL_TRACE( "Exception caught for property Volume: %s", aBStr.GetBuffer());
+ rtl::OString aBStr(rtl::OUStringToOString(rEx.Message, RTL_TEXTENCODING_ASCII_US));
+ OSL_TRACE("Exception caught for property Volume: %s", aBStr.getStr());
#else
(void)rEx; // avoid warning for pro build
#endif
diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx
index 6407201..2ddcb8e 100644
--- a/xmloff/source/core/xmlerror.cxx
+++ b/xmloff/source/core/xmlerror.cxx
@@ -193,9 +193,9 @@ void XMLErrors::AddRecord(
}
// convert to byte string and signal the error
- ByteString aError( String( sMessage.makeStringAndClear() ),
- RTL_TEXTENCODING_ASCII_US );
- OSL_FAIL( aError.GetBuffer() );
+ rtl::OString aError(rtl::OUStringToOString(sMessage.makeStringAndClear(),
+ RTL_TEXTENCODING_ASCII_US));
+ OSL_FAIL( aError.getStr() );
#endif
}
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 54b02a4..f244a5c 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -898,15 +898,15 @@ sal_Bool SAL_CALL SvXMLExport::filter( const uno::Sequence< beans::PropertyValue
if (GetModel().is())
{
// print a trace message with the URL
- ByteString aUrl( (String) GetModel()->getURL(),
- RTL_TEXTENCODING_ASCII_US );
- RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "%s", aUrl.GetBuffer() );
+ rtl::OString aUrl(rtl::OUStringToOString(GetModel()->getURL(),
+ RTL_TEXTENCODING_ASCII_US));
+ RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "%s", aUrl.getStr() );
// we also want a trace message with the document class
- ByteString aClass( (String)GetXMLToken(meClass),
- RTL_TEXTENCODING_ASCII_US );
+ rtl::OString aClass(rtl::OUStringToOString(GetXMLToken(meClass),
+ RTL_TEXTENCODING_ASCII_US));
RTL_LOGFILE_CONTEXT_TRACE1( aLogContext, "class=\"%s\"",
- aClass.GetBuffer() );
+ aClass.getStr() );
}
#endif
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 9574bd7..cb431db 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -725,10 +725,10 @@ void SAL_CALL SvXMLImport::startElement( const OUString& rName,
#ifdef TIMELOG
// If we do profiling, we want a trace message for the first element
// in order to identify the stream.
- ByteString aString( (String)rName, RTL_TEXTENCODING_ASCII_US );
+ rtl::OString aString(rtl::OUStringToOString(rName, RTL_TEXTENCODING_ASCII_US));
RTL_LOGFILE_TRACE_AUTHOR1( "xmloff", LOGFILE_AUTHOR,
"SvXMLImport::StartElement( \"%s\", ... )",
- aString.GetBuffer() );
+ aString.getStr() );
#endif
pContext = CreateContext( nPrefix, aLocalName, xAttrList );
commit b2aa7673de144df737374b9173b5539f36f6a533
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 8 11:02:50 2011 +0100
ByteString->rtl::OString
diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
index cb740e5..6842a69 100644
--- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
+++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx
@@ -135,11 +135,13 @@ char* GetPasswordFunction( PK11SlotInfo* pSlot, PRBool bRetry, void* /*arg*/ )
if ( pPasswordRequest->isPassword() )
{
- ByteString aPassword = ByteString( String( pPasswordRequest->getPassword() ), gsl_getSystemTextEncoding() );
- sal_uInt16 nLen = aPassword.Len();
+ rtl::OString aPassword(rtl::OUStringToOString(
+ pPasswordRequest->getPassword(),
+ osl_getThreadTextEncoding()));
+ sal_Int32 nLen = aPassword.getLength();
char* pPassword = (char*) PORT_Alloc( nLen+1 ) ;
pPassword[nLen] = 0;
- memcpy( pPassword, aPassword.GetBuffer(), nLen );
+ memcpy( pPassword, aPassword.getStr(), nLen );
return pPassword;
}
}
commit 625d5639cb983d35179747b29b5f54e50ade929a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 8 10:44:14 2011 +0100
aEmptyByteStr unnecessary
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index c0b7b92..ca036da 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -96,7 +96,6 @@ const SwTwips lMinBorder = 1134;
// Constant strings.
SW_DLLPUBLIC extern UniString aEmptyStr; // ""
-extern ByteString aEmptyByteStr; // ""
SW_DLLPUBLIC extern UniString aDotStr; // '.'
// For inserting of captions (what and where to insert).
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index a683ed1..ef21a11 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -58,7 +58,6 @@
using namespace com::sun::star;
-ByteString aEmptyByteStr; // Konstante Strings
String aEmptyStr; // Konstante Strings
String aDotStr('.'); // Konstante Strings
commit 460ed871fa2e9b4ff0ba1c729a49568c2f6ec6f6
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Oct 8 10:42:37 2011 +0100
ByteString->rtl::OString
diff --git a/filter/inc/filter/msfilter/msdffimp.hxx b/filter/inc/filter/msfilter/msdffimp.hxx
index 48a9231..9dabeb0 100644
--- a/filter/inc/filter/msfilter/msdffimp.hxx
+++ b/filter/inc/filter/msfilter/msdffimp.hxx
@@ -574,7 +574,7 @@ public:
void* pSvxMSDffDummy1;
void* pSvxMSDffDummy2;
void* pSvxMSDffDummy3;
- std::map<sal_uInt32,ByteString> aEscherBlipCache;
+ std::map<sal_uInt32,rtl::OString> aEscherBlipCache;
DffRecordManager maShapeRecords;
ColorData mnDefaultColor;
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 819f95e..a7e977d 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6584,7 +6584,7 @@ sal_Bool SvxMSDffManager::GetBLIP( sal_uLong nIdx_, Graphic& rData, Rectangle* p
// check if a graphic for this blipId is already imported
if ( nIdx_)
{
- std::map<sal_uInt32,ByteString>::iterator iter = aEscherBlipCache.find(nIdx_);
+ std::map<sal_uInt32,rtl::OString>::iterator iter = aEscherBlipCache.find(nIdx_);
if (iter != aEscherBlipCache.end())
{
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index 555f4e6..246bd60 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -700,7 +700,7 @@ class SwMSDffManager : public SvxMSDffManager
private:
SwWW8ImplReader& rReader;
SvStream *pFallbackStream;
- std::map<sal_uInt32,ByteString> aOldEscherBlipCache;
+ std::map<sal_uInt32,rtl::OString> aOldEscherBlipCache;
virtual sal_Bool GetOLEStorageName( long nOLEId, String& rStorageName,
SvStorageRef& rSrcStorage, com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rDestStorage ) const;
commit 085e3605cdb5bcc852de95a14de57106ae66998e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 7 21:58:07 2011 +0100
update list
diff --git a/unusedcode.easy b/unusedcode.easy
index 1e14592..b11938d 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -1231,7 +1231,6 @@ SwVbaTableHelper::setTableWidth(int)
SwView::LinkStubHtmlOptionsHdl(void*, void*)
SwView::LinkStubSpellError(void*, void*)
SwViewImp::LinkStubSetStopPrt(void*, void*)
-SwWW8Writer::InsUInt32(std::vector<unsigned char, std::allocator<unsigned char> >&, unsigned int)
SwWriteTableCols::Insert(SwWriteTableCol* const&, unsigned short&)
SwWriteTableCols::Insert(SwWriteTableCol* const*, unsigned short)
SwWriteTableCols::Insert(SwWriteTableCols const*, unsigned short, unsigned short)
@@ -1326,9 +1325,6 @@ WPXPropertyList::Iter::last()
WPXPropertyListVector::Iter::last()
WPXString::Iter::last()
WPXSubDocument::WPXSubDocument()
-WW8Bytes::Replace(unsigned char const&, unsigned short)
-WW8Bytes::Replace(unsigned char const*, unsigned short, unsigned short)
-WW8Bytes::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned char const&, void*), void*)
WW8OleMaps::Insert(WW8OleMap* const&, unsigned short&)
WW8OleMaps::Insert(WW8OleMap* const*, unsigned short)
WW8OleMaps::Insert(WW8OleMaps const*, unsigned short, unsigned short)
@@ -1924,11 +1920,6 @@ binfilter::SwpHtStart::Insert(binfilter::SwTxtAttr const*&, unsigned short&)
binfilter::SwpHtStart::Insert(binfilter::SwTxtAttr const**, unsigned short)
binfilter::SwpHtStart::Insert(binfilter::SwpHtStart const*, unsigned short, unsigned short)
binfilter::SwpHtStart::Remove(binfilter::SwTxtAttr const*&, unsigned short)
-binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTab const*, unsigned short, unsigned short)
-binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTabEntry* const&, unsigned short&)
-binfilter::W4WStyleIdTab::Insert(binfilter::W4WStyleIdTabEntry* const*, unsigned short)
-binfilter::W4WStyleIdTab::Remove(binfilter::W4WStyleIdTabEntry* const&, unsigned short)
-binfilter::W4WStyleIdTab::Remove(unsigned short, unsigned short)
binfilter::WritingDirectionInfos::Insert(binfilter::WritingDirectionInfos const*, unsigned short, unsigned short, unsigned short)
binfilter::WritingDirectionInfos::Replace(binfilter::WritingDirectionInfo const&, unsigned short)
binfilter::WritingDirectionInfos::Replace(binfilter::WritingDirectionInfo const*, unsigned short, unsigned short)
@@ -2471,6 +2462,7 @@ oox::drawingml::CustomShapeProperties::getValue(std::vector<oox::drawingml::Cust
oox::drawingml::Diagram::getLayoutId() const
oox::drawingml::DiagramLayout::layout(std::vector<oox::drawingml::dgm::Point, std::allocator<oox::drawingml::dgm::Point> > const&, com::sun::star::awt::Point const&)
oox::drawingml::GetPoint2D(com::sun::star::uno::Reference<com::sun::star::xml::sax::XFastAttributeList> const&)
+oox::drawingml::GetShapePresetType(int)
oox::drawingml::GetTextMargin(rtl::OUString const&)
oox::drawingml::GetTextVerticalAdjust(int)
oox::drawingml::GraphicProperties::assignUsed(oox::drawingml::GraphicProperties const&)
commit 826ec1cc52aad525bcee3f3cda656e07a491fd98
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Oct 7 21:57:32 2011 +0100
callcatcher: SvxHtmlExportModeConfigItem_Impl unused now
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index fe0af32..21600da 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -69,54 +69,6 @@
#include <svl/slstitm.hxx>
#include <svl/aeitem.hxx>
#include <sfx2/request.hxx>
-// configuration helper =======================================================
-
-/** Helper to get a configuration setting.
- @descr This is a HACK to get a configuration item directly. Normally the
- OfaHtmlOptions class from 'offmgr' project would do the job, but we cannot
- use it here. On the other hand, the OfaHtmlOptions cannot be moved to
- 'svtools', because it uses 'svx' itself...
- The correct way would be to move OfaHtmlOptions to 'svtools' anyway, and to
- remove the dependency from 'svx' (a call to the static function
- SvxTextEncodingBox::GetBestMimeEncoding(), which contains low level
- operations that can be moved to lower projects, i.e. 'rtl'). Then this
- class can be removed, and the OfaHtmlOptions can be used instead. */
-class SvxHtmlExportModeConfigItem_Impl : public utl::ConfigItem
-{
-public:
- explicit SvxHtmlExportModeConfigItem_Impl();
-
- /** Returns the HTML export mode, as read from the configuration. */
- inline sal_Int32 GetExportMode() const { return mnExpMode; }
-
- virtual void Commit();
- virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
-
-private:
- sal_Int32 mnExpMode;
-};
-
-SvxHtmlExportModeConfigItem_Impl::SvxHtmlExportModeConfigItem_Impl() :
- utl::ConfigItem( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/HTML/Export" ) ) ),
- mnExpMode( 3 ) // default to 3 == HTML_CFG_NS40, see offmgr/htmlcfg.hxx
-{
- using com::sun::star::uno::Sequence;
- using com::sun::star::uno::Any;
-
- Sequence< rtl::OUString > aPropNames( 1 );
- aPropNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Browser" ) );
- Sequence< Any > aPropValues( GetProperties( aPropNames ) );
- if( aPropValues.getLength() == 1 )
- aPropValues[ 0 ] >>= mnExpMode;
-}
-
-void SvxHtmlExportModeConfigItem_Impl::Commit()
-{
-}
-
-void SvxHtmlExportModeConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
-{
-}
// static ----------------------------------------------------------------
More information about the Libreoffice-commits
mailing list