[Libreoffice-commits] .: 7 commits - i18npool/qa sc/source sw/inc sw/qa sw/source unusedcode.easy xmloff/inc xmloff/source
Caolán McNamara
caolan at kemper.freedesktop.org
Thu Nov 3 05:19:08 PDT 2011
i18npool/qa/cppunit/test_breakiterator.cxx | 18
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 439 -----------------------
sc/source/filter/xml/XMLExportDatabaseRanges.hxx | 6
sw/inc/breakit.hxx | 4
sw/qa/core/data/ww8/pass/CVE-2003-0820-1.doc |binary
sw/qa/core/swdoc-test.cxx | 39 +-
sw/source/core/bastyp/breakit.cxx | 17
sw/source/core/bastyp/swcache.cxx | 2
sw/source/core/doc/dbgoutsw.cxx | 6
sw/source/core/inc/fntcache.hxx | 2
sw/source/core/inc/swcache.hxx | 4
sw/source/core/txtnode/txtedt.cxx | 9
sw/source/filter/html/css1atr.cxx | 101 ++---
sw/source/filter/html/htmlatr.cxx | 49 +-
sw/source/filter/html/wrthtml.hxx | 10
unusedcode.easy | 11
xmloff/inc/SchXMLImport.hxx | 7
xmloff/inc/xmloff/SchXMLImportHelper.hxx | 4
xmloff/inc/xmloff/xmlimp.hxx | 20 -
xmloff/inc/xmloff/xmluconv.hxx | 3
xmloff/source/chart/SchXMLImport.cxx | 64 ---
xmloff/source/core/xmlimp.cxx | 76 ---
xmloff/source/core/xmluconv.cxx | 3
23 files changed, 159 insertions(+), 735 deletions(-)
New commits:
commit 7d4f986abf2b0e1c661a39e66e389ccd354a6ac1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 3 12:14:39 2011 +0000
ditch ScXMLExportDatabaseRanges::getOperatorXML
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 05f038e..4b56c64 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -132,64 +132,6 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang
return aSkipRanges;
}
-rtl::OUString ScXMLExportDatabaseRanges::getOperatorXML(const long aFilterOperator, const bool bUseRegularExpressions) const
-{
- switch (aFilterOperator)
- {
- case sheet::FilterOperator2::EQUAL :
- {
- if (bUseRegularExpressions)
- return GetXMLToken(XML_MATCH);
- else
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("="));
- }
- case sheet::FilterOperator2::NOT_EQUAL :
- {
- if (bUseRegularExpressions)
- return GetXMLToken(XML_NOMATCH);
- else
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("!="));
- }
- case sheet::FilterOperator2::BOTTOM_PERCENT :
- return GetXMLToken(XML_BOTTOM_PERCENT);
- case sheet::FilterOperator2::BOTTOM_VALUES :
- return GetXMLToken(XML_BOTTOM_VALUES);
- case sheet::FilterOperator2::EMPTY :
- return GetXMLToken(XML_EMPTY);
- case sheet::FilterOperator2::GREATER :
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">"));
- case sheet::FilterOperator2::GREATER_EQUAL :
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">="));
- case sheet::FilterOperator2::LESS :
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<"));
- case sheet::FilterOperator2::LESS_EQUAL :
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<="));
- case sheet::FilterOperator2::NOT_EMPTY :
- return GetXMLToken(XML_NOEMPTY);
- case sheet::FilterOperator2::TOP_PERCENT :
- return GetXMLToken(XML_TOP_PERCENT);
- case sheet::FilterOperator2::TOP_VALUES :
- return GetXMLToken(XML_TOP_VALUES);
- case sheet::FilterOperator2::CONTAINS :
- return GetXMLToken(XML_CONTAINS);
- case sheet::FilterOperator2::DOES_NOT_CONTAIN :
- return GetXMLToken(XML_DOES_NOT_CONTAIN);
- case sheet::FilterOperator2::BEGINS_WITH :
- return GetXMLToken(XML_BEGINS_WITH);
- case sheet::FilterOperator2::DOES_NOT_BEGIN_WITH :
- return GetXMLToken(XML_DOES_NOT_BEGIN_WITH);
- case sheet::FilterOperator2::ENDS_WITH :
- return GetXMLToken(XML_ENDS_WITH);
- case sheet::FilterOperator2::DOES_NOT_END_WITH :
- return GetXMLToken(XML_DOES_NOT_END_WITH);
- default:
- {
- // added to avoid warnings
- }
- }
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("="));
-}
-
namespace {
class WriteDatabaseRange : public ::std::unary_function<ScDBData, void>
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
index becf1fc..e985956 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
@@ -46,7 +46,6 @@ class ScXMLExportDatabaseRanges
ScXMLExport& rExport;
ScDocument* pDoc;
- rtl::OUString getOperatorXML(const long aFilterOperator, const bool bUseRegularExpressions) const;
public:
ScXMLExportDatabaseRanges(ScXMLExport& rExport);
~ScXMLExportDatabaseRanges();
commit af55fea94ee2c495629cbe7e4dada387276a85b1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 3 11:05:48 2011 +0000
utf-16, not utf-8
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index 839d2e9..d7d453f 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -207,7 +207,7 @@ void SwDocTest::testUserPerceivedCharCount()
CPPUNIT_ASSERT_MESSAGE("Grapheme Count should be 1", nGraphemeCount == 1);
//Surrogate pair example, one single unicode code-point (U+1D11E)
- //represented as two code units in UTF-8
+ //represented as two code units in UTF-16
const sal_Unicode GCLEF[] = { 0xD834, 0xDD1E };
::rtl::OUString sGCLEF(GCLEF, SAL_N_ELEMENTS(GCLEF));
sal_Int32 nCount = pBreakIter->getGraphemeCount(sGCLEF);
commit 01501ea9efc8128b1ba34baeefe65cad0b6ba428
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 3 11:04:34 2011 +0000
add missing tests
diff --git a/sw/qa/core/data/ww8/pass/CVE-2003-0820-1.doc b/sw/qa/core/data/ww8/pass/CVE-2003-0820-1.doc
new file mode 100644
index 0000000..b3466d2
Binary files /dev/null and b/sw/qa/core/data/ww8/pass/CVE-2003-0820-1.doc differ
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index d6f145f..839d2e9 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -81,6 +81,7 @@ public:
CPPUNIT_TEST(randomTest);
CPPUNIT_TEST(testPageDescName);
CPPUNIT_TEST(testFileNameFields);
+ CPPUNIT_TEST(testDocStat);
CPPUNIT_TEST(testSwScanner);
CPPUNIT_TEST(testUserPerceivedCharCount);
CPPUNIT_TEST(testGraphicAnchorDeletion);
commit 12db5315fca413ae66e88c4cd8212ee3b01667b7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 3 11:00:38 2011 +0000
Follow UAX-29 and present user-perceived character counts
Not a count of code-units, nor a count of code-points, but try and follow
http://unicode.org/reports/tr29/ and present the grapheme count.
Add a few representative tests to try and avoid gotchas.
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index ab5936a..dfe3424 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -151,6 +151,24 @@ void TestBreakIterator::testGraphemeIteration()
i18n::CharacterIteratorMode::SKIPCELL, 1, nDone);
CPPUNIT_ASSERT_MESSAGE("Should skip full grapheme", nPos == 0);
}
+
+ {
+ const sal_Unicode ALEF_QAMATS [] = { 0x05D0, 0x05B8 };
+ ::rtl::OUString aText(ALEF_QAMATS, SAL_N_ELEMENTS(ALEF_QAMATS));
+
+ sal_Int32 nGraphemeCount = 0;
+
+ sal_Int32 nCurPos = 0;
+ while (nCurPos < aText.getLength())
+ {
+ sal_Int32 nCount2 = 1;
+ nCurPos = m_xBreak->nextCharacters(aText, nCurPos, lang::Locale(),
+ i18n::CharacterIteratorMode::SKIPCELL, nCount2, nCount2);
+ ++nGraphemeCount;
+ }
+
+ CPPUNIT_ASSERT_MESSAGE("Should be considered 1 grapheme", nGraphemeCount == 1);
+ }
}
//A test to ensure that certain ranges and codepoints that are categorized as
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index ae05468..3075fc9 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -110,7 +110,9 @@ public:
}
sal_uInt16 GetRealScriptOfText( const String& rTxt, xub_StrLen nPos ) const;
- sal_uInt16 GetAllScriptsOfText( const String& rTxt ) const;
+ sal_uInt16 GetAllScriptsOfText( const String& rTxt ) const;
+
+ sal_Int32 getGraphemeCount(const rtl::OUString& rStr) const;
};
#define SW_BREAKITER() SwBreakIt::Get()
diff --git a/sw/qa/core/swdoc-test.cxx b/sw/qa/core/swdoc-test.cxx
index 3d27fa0..d6f145f 100644
--- a/sw/qa/core/swdoc-test.cxx
+++ b/sw/qa/core/swdoc-test.cxx
@@ -41,19 +41,20 @@
#include <sfx2/docfile.hxx>
#include <sfx2/sfxmodelfactory.hxx>
-#include "init.hxx"
-#include "swtypes.hxx"
-#include "docstat.hxx"
+#include "breakit.hxx"
#include "doc.hxx"
-#include "ndtxt.hxx"
#include "docsh.hxx"
-#include "shellres.hxx"
+#include "docstat.hxx"
#include "docufld.hxx"
#include "fmtanchr.hxx"
-#include "swscanner.hxx"
+#include "init.hxx"
+#include "ndtxt.hxx"
+#include "shellio.hxx"
+#include "shellres.hxx"
#include "swcrsr.hxx"
+#include "swscanner.hxx"
#include "swmodule.hxx"
-#include "shellio.hxx"
+#include "swtypes.hxx"
SO2_DECL_REF(SwDocShell)
SO2_IMPL_REF(SwDocShell)
@@ -73,14 +74,15 @@ public:
void testFileNameFields();
void testDocStat();
void testSwScanner();
+ void testUserPerceivedCharCount();
void testGraphicAnchorDeletion();
CPPUNIT_TEST_SUITE(SwDocTest);
CPPUNIT_TEST(randomTest);
CPPUNIT_TEST(testPageDescName);
CPPUNIT_TEST(testFileNameFields);
- CPPUNIT_TEST(testDocStat);
CPPUNIT_TEST(testSwScanner);
+ CPPUNIT_TEST(testUserPerceivedCharCount);
CPPUNIT_TEST(testGraphicAnchorDeletion);
CPPUNIT_TEST_SUITE_END();
@@ -189,6 +191,28 @@ void SwDocTest::testDocStat()
CPPUNIT_ASSERT_MESSAGE("And cache is updated too", m_pDoc->GetDocStat().nChar == nLen);
}
+//For UI character counts we should follow UAX#29 and display the user
+//perceived characters, not the number of codepoints, nor the number of code
+//units http://unicode.org/reports/tr29/
+void SwDocTest::testUserPerceivedCharCount()
+{
+ SwBreakIt *pBreakIter = SwBreakIt::Get();
+
+ //Grapheme example, two different unicode code-points perceived by the user as a single
+ //glyph
+ const sal_Unicode ALEF_QAMATS [] = { 0x05D0, 0x05B8 };
+ ::rtl::OUString sALEF_QAMATS(ALEF_QAMATS, SAL_N_ELEMENTS(ALEF_QAMATS));
+ sal_Int32 nGraphemeCount = pBreakIter->getGraphemeCount(sALEF_QAMATS);
+ CPPUNIT_ASSERT_MESSAGE("Grapheme Count should be 1", nGraphemeCount == 1);
+
+ //Surrogate pair example, one single unicode code-point (U+1D11E)
+ //represented as two code units in UTF-8
+ const sal_Unicode GCLEF[] = { 0xD834, 0xDD1E };
+ ::rtl::OUString sGCLEF(GCLEF, SAL_N_ELEMENTS(GCLEF));
+ sal_Int32 nCount = pBreakIter->getGraphemeCount(sGCLEF);
+ CPPUNIT_ASSERT_MESSAGE("Surrogate Pair should be counted as single character", nCount == 1);
+}
+
//See https://bugs.freedesktop.org/show_bug.cgi?id=40449 for motivation
void SwDocTest::testSwScanner()
{
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index 69a35b7..2435aae 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -33,6 +33,7 @@
#include <unicode/uchar.h>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/i18n/ScriptType.hdl>
+#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
#include <unotools/localedatawrapper.hxx>
#include <editeng/unolingu.hxx>
@@ -169,4 +170,20 @@ sal_uInt16 SwBreakIt::GetAllScriptsOfText( const String& rTxt ) const
return nRet;
}
+sal_Int32 SwBreakIt::getGraphemeCount(const rtl::OUString& rText) const
+{
+ sal_Int32 nGraphemeCount = 0;
+
+ sal_Int32 nCurPos = 0;
+ while (nCurPos < rText.getLength())
+ {
+ sal_Int32 nCount2 = 1;
+ nCurPos = xBreak->nextCharacters(rText, nCurPos, lang::Locale(),
+ i18n::CharacterIteratorMode::SKIPCELL, nCount2, nCount2);
+ ++nGraphemeCount;
+ }
+
+ return nGraphemeCount;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index 0c70225..8fe6051 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1862,12 +1862,13 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
if( 1 != aExpandText.match(aBreakWord, aScanner.GetBegin() ))
{
++nTmpWords;
- nTmpCharsExcludingSpaces += aScanner.GetLen();
+ nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(aScanner.GetWord());
}
}
}
- nTmpChars = nExpandEnd - nExpandBegin - nNumOfMaskedChars;
+ nTmpChars = pBreakIt->getGraphemeCount(aExpandText.copy(nExpandBegin, nExpandEnd - nExpandBegin));
+ nTmpChars -= nNumOfMaskedChars;
// no nTmpCharsExcludingSpaces adjust needed neither for blanked out MaskedChars
// nor for mid-word selection - set scanner bClip = true at creation
@@ -1889,10 +1890,10 @@ void SwTxtNode::CountWords( SwDocStat& rStat,
while ( aScanner.NextWord() )
{
++nTmpWords;
- nTmpCharsExcludingSpaces += aScanner.GetLen();
+ nTmpCharsExcludingSpaces += pBreakIt->getGraphemeCount(aScanner.GetWord());
}
- nTmpChars += nNumStringLen;
+ nTmpChars = pBreakIt->getGraphemeCount(aNumString);
}
else if ( HasBullet() )
{
commit 56d5a48099165dabb72eb3a2655c2eb503684f1c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Nov 3 09:06:35 2011 +0000
callcatcher: drop unused methods
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 645a3c6..05f038e 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -190,24 +190,6 @@ rtl::OUString ScXMLExportDatabaseRanges::getOperatorXML(const long aFilterOperat
return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("="));
}
-void ScXMLExportDatabaseRanges::WriteCondition(const sheet::TableFilterField2& aFilterField, bool bIsCaseSensitive, bool bUseRegularExpressions)
-{
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, rtl::OUString::valueOf(aFilterField.Field));
- if (bIsCaseSensitive)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
- if (aFilterField.IsNumeric)
- {
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_NUMBER);
- rtl::OUStringBuffer sBuffer;
- ::sax::Converter::convertDouble(sBuffer, aFilterField.NumericValue);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, sBuffer.makeStringAndClear());
- }
- else
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_VALUE, aFilterField.StringValue);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_OPERATOR, getOperatorXML(aFilterField.Operator, bUseRegularExpressions));
- SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, true, true);
-}
-
namespace {
class WriteDatabaseRange : public ::std::unary_function<ScDBData, void>
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
index 425cdf8..becf1fc 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
@@ -47,7 +47,6 @@ class ScXMLExportDatabaseRanges
ScDocument* pDoc;
rtl::OUString getOperatorXML(const long aFilterOperator, const bool bUseRegularExpressions) const;
- void WriteCondition(const com::sun::star::sheet::TableFilterField2& aFilterField, bool bIsCaseSensitive, bool bUseRegularExpressions);
public:
ScXMLExportDatabaseRanges(ScXMLExport& rExport);
~ScXMLExportDatabaseRanges();
diff --git a/unusedcode.easy b/unusedcode.easy
index d1f026f..df42230 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -741,11 +741,8 @@ SvXMLEmbeddedElementArr::Remove(unsigned short, unsigned short)
SvXMLExport::GetErrors()
SvXMLExport::SvXMLExport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, rtl::OUString const&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XDocumentHandler> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&, com::sun::star::uno::Reference<com::sun::star::document::XGraphicObjectResolver> const&, short)
SvXMLExportPropertyMapper::exportXML(SvXMLAttributeList&, XMLPropertyState const&, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned short) const
-SvXMLImport::GetErrors()
SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
SvXMLImport::SetError(int, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&, rtl::OUString const&)
-SvXMLImport::SvXMLImport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel> const&)
-SvXMLImport::getImplementation(com::sun::star::uno::Reference<com::sun::star::uno::XInterface>)
SvXMLImportContexts_Impl::DeleteAndDestroy(unsigned short, unsigned short)
SvXMLImportPropertyMapper::importXML(std::__debug::vector<XMLPropertyState, std::allocator<XMLPropertyState> >&, com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>, SvXMLUnitConverter const&, SvXMLNamespaceMap const&, unsigned int) const
SvXMLNamespaceMap::AddAtIndex(unsigned short, char const*, char const*, unsigned short)
@@ -761,7 +758,6 @@ SvXMLTokenMap_Impl::Remove(unsigned short, unsigned short)
SvXMLUnitConverter::GetCoreMeasureUnit() const
SvXMLUnitConverter::convertEnum(rtl::OUStringBuffer&, unsigned short, SvXMLEnumStringMapEntry const*, char*)
SvXMLUnitConverter::convertMeasureToXML(rtl::OUStringBuffer&, int, short) const
-SvXMLUnitConverter::setNullDate(com::sun::star::util::Date const&)
SvpSalInstance::CancelEvent(SalFrame const*, void*, unsigned short)
SvtAcceleratorConfiguration::GetCommand(com::sun::star::awt::KeyEvent const&)
SvtAcceleratorConfiguration::GetItems()
diff --git a/xmloff/inc/xmloff/xmlimp.hxx b/xmloff/inc/xmloff/xmlimp.hxx
index 498aed4..eb8b950 100644
--- a/xmloff/inc/xmloff/xmlimp.hxx
+++ b/xmloff/inc/xmloff/xmlimp.hxx
@@ -197,26 +197,9 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
sal_uInt16 nImportFlags = IMPORT_ALL ) throw();
- // #110680#
- //SvXMLImport( const ::com::sun::star::uno::Reference<
- // ::com::sun::star::frame::XModel > & ) throw();
- SvXMLImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & ) throw();
-
- // #110680#
- //SvXMLImport( const ::com::sun::star::uno::Reference<
- // ::com::sun::star::frame::XModel > &,
- // const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > & ) throw();
- SvXMLImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > &,
- const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > & ) throw();
-
virtual ~SvXMLImport() throw();
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
- static SvXMLImport* getImplementation( ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ) throw();
// ::com::sun::star::xml::sax::XDocumentHandler
virtual void SAL_CALL startDocument(void)
@@ -396,9 +379,6 @@ public:
const rtl::OUString& rMsg3,
const rtl::OUString& rMsg4 );
- /** return list of errors */
- XMLErrors* GetErrors();
-
/** return current error flags */
sal_uInt16 GetErrorFlags() { return mnErrorFlags; }
diff --git a/xmloff/inc/xmloff/xmluconv.hxx b/xmloff/inc/xmloff/xmluconv.hxx
index 2f822de..003fe8c 100644
--- a/xmloff/inc/xmloff/xmluconv.hxx
+++ b/xmloff/inc/xmloff/xmluconv.hxx
@@ -189,9 +189,6 @@ public:
sal_Bool setNullDate (
const com::sun::star::uno::Reference <com::sun::star::frame::XModel>& xModel);
- /** Set the Null Date of the UnitConverter */
- void setNullDate ( const com::sun::star::util::Date& aTempNullDate );
-
/** convert double to ISO Date Time String */
void convertDateTime( ::rtl::OUStringBuffer& rBuffer,
const double& fDateTime,
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 1fe7a1e..aa2b46c 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -374,63 +374,6 @@ SvXMLImport::SvXMLImport(
_InitCtor();
}
-// #110680#
-SvXMLImport::SvXMLImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const Reference< XModel > & rModel ) throw ()
-: mxModel( rModel ),
- mxNumberFormatsSupplier (rModel, uno::UNO_QUERY),
- mpImpl( new SvXMLImport_Impl() ),
- mpNamespaceMap( new SvXMLNamespaceMap ),
- mpUnitConv( new SvXMLUnitConverter(xServiceFactory,
- util::MeasureUnit::MM_100TH, util::MeasureUnit::MM_100TH) ),
- mpContexts( new SvXMLImportContexts_Impl ),
- mpNumImport( NULL ),
- mpProgressBarHelper( NULL ),
- mpEventImportHelper( NULL ),
- mpXMLErrors( NULL ),
- mpStyleMap(0),
- mnImportFlags( IMPORT_ALL ),
- mnErrorFlags(0),
- // #110680#
- mxServiceFactory(xServiceFactory),
- mbIsFormsSupported( sal_True ),
- mbIsTableShapeSupported( false ),
- mbIsGraphicLoadOnDemandSupported( true )
-{
- DBG_ASSERT( mxServiceFactory.is(), "got no service manager" );
- _InitCtor();
-}
-
-// #110680#
-SvXMLImport::SvXMLImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- const Reference< XModel > & rModel,
- const ::com::sun::star::uno::Reference< ::com::sun::star::document::XGraphicObjectResolver > & rGraphicObjects ) throw ()
-: mxModel( rModel ),
- mxNumberFormatsSupplier (rModel, uno::UNO_QUERY),
- mxGraphicResolver( rGraphicObjects ),
- mpImpl( new SvXMLImport_Impl() ),
- mpNamespaceMap( new SvXMLNamespaceMap ),
- mpUnitConv( new SvXMLUnitConverter(xServiceFactory,
- util::MeasureUnit::MM_100TH, util::MeasureUnit::MM_100TH) ),
- mpContexts( new SvXMLImportContexts_Impl ),
- mpNumImport( NULL ),
- mpProgressBarHelper( NULL ),
- mpEventImportHelper( NULL ),
- mpXMLErrors( NULL ),
- mpStyleMap(0),
- mnImportFlags( IMPORT_ALL ),
- mnErrorFlags(0),
- // #110680#
- mxServiceFactory(xServiceFactory),
- mbIsFormsSupported( sal_True ),
- mbIsGraphicLoadOnDemandSupported( true )
-{
- DBG_ASSERT( mxServiceFactory.is(), "got no service manager" );
- _InitCtor();
-}
-
SvXMLImport::~SvXMLImport() throw ()
{
delete mpXMLErrors;
@@ -478,20 +421,6 @@ const uno::Sequence< sal_Int8 > & SvXMLImport::getUnoTunnelId() throw()
return theSvXMLImportUnoTunnelId::get().getSeq();
}
-SvXMLImport* SvXMLImport::getImplementation( uno::Reference< uno::XInterface > xInt ) throw()
-{
- uno::Reference< lang::XUnoTunnel > xUT( xInt, uno::UNO_QUERY );
- if( xUT.is() )
- {
- return
- reinterpret_cast<SvXMLImport*>(
- sal::static_int_cast<sal_IntPtr>(
- xUT->getSomething( SvXMLImport::getUnoTunnelId())));
- }
- else
- return NULL;
-}
-
// XUnoTunnel
sal_Int64 SAL_CALL SvXMLImport::getSomething( const uno::Sequence< sal_Int8 >& rId )
throw( uno::RuntimeException )
@@ -1820,11 +1749,6 @@ void SvXMLImport::SetError(
SetError( nId, aSeq );
}
-XMLErrors* SvXMLImport::GetErrors()
-{
- return mpXMLErrors;
-}
-
void SvXMLImport::DisposingModel()
{
if( mxFontDecls.Is() )
diff --git a/xmloff/source/core/xmluconv.cxx b/xmloff/source/core/xmluconv.cxx
index 97c8c9b..cb68a06 100644
--- a/xmloff/source/core/xmluconv.cxx
+++ b/xmloff/source/core/xmluconv.cxx
@@ -362,9 +362,6 @@ sal_Bool SvXMLUnitConverter::setNullDate(const com::sun::star::uno::Reference <c
return sal_False;
}
-void SvXMLUnitConverter::setNullDate(const util::Date& aTempNullDate)
- { m_pImpl->m_aNullDate = aTempNullDate; }
-
/** convert double to ISO Date Time String */
void SvXMLUnitConverter::convertDateTime(::rtl::OUStringBuffer& rBuffer,
const double& fDateTime, bool const bAddTimeIf0AM)
commit eaefa688bfff0f73992c84496d4ce89e16ac3550
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 2 22:33:34 2011 +0000
callcatcher: ditch some unused code
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
index 9fb61fa..645a3c6 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx
@@ -132,81 +132,6 @@ ScMyEmptyDatabaseRangesContainer ScXMLExportDatabaseRanges::GetEmptyDatabaseRang
return aSkipRanges;
}
-void ScXMLExportDatabaseRanges::WriteImportDescriptor(const uno::Sequence <beans::PropertyValue> aImportDescriptor)
-{
- sal_Int32 nProperties = aImportDescriptor.getLength();
- rtl::OUString sDatabaseName;
- rtl::OUString sConRes;
- rtl::OUString sSourceObject;
- sheet::DataImportMode nSourceType = sheet::DataImportMode_NONE;
- bool bNative = false;
- for (sal_Int16 i = 0; i < nProperties; ++i)
- {
- if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_DBNAME)))
- aImportDescriptor[i].Value >>= sDatabaseName;
- else if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CONRES)))
- aImportDescriptor[i].Value >>= sConRes;
- else if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SRCOBJ)))
- aImportDescriptor[i].Value >>= sSourceObject;
- else if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SRCTYPE)))
- aImportDescriptor[i].Value >>= nSourceType;
- else if (aImportDescriptor[i].Name == rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISNATIVE)))
- bNative = ::cppu::any2bool(aImportDescriptor[i].Value);
- }
- switch (nSourceType)
- {
- case sheet::DataImportMode_NONE : break;
- case sheet::DataImportMode_QUERY :
- {
- if (sDatabaseName.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, sDatabaseName);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_QUERY_NAME, sSourceObject);
- SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, true, true);
- if (sConRes.getLength())
- {
- rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sConRes );
- SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, true, true);
- }
- rExport.CheckAttrList();
- }
- break;
- case sheet::DataImportMode_TABLE :
- {
- if (sDatabaseName.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, sDatabaseName);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TABLE_NAME, sSourceObject);
- SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, true, true);
- if (sConRes.getLength())
- {
- rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sConRes );
- SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, true, true);
- }
- rExport.CheckAttrList();
- }
- break;
- case sheet::DataImportMode_SQL :
- {
- if (sDatabaseName.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATABASE_NAME, sDatabaseName);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, sSourceObject);
- if (!bNative)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TRUE);
- SvXMLElementExport aElemID(rExport, XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, true, true);
- if (sConRes.getLength())
- {
- rExport.AddAttribute( XML_NAMESPACE_XLINK, XML_HREF, sConRes );
- SvXMLElementExport aElemCR(rExport, XML_NAMESPACE_FORM, XML_CONNECTION_RESOURCE, true, true);
- }
- rExport.CheckAttrList();
- }
- break;
- default:
- {
- // added to avoid warnings
- }
- }
-}
-
rtl::OUString ScXMLExportDatabaseRanges::getOperatorXML(const long aFilterOperator, const bool bUseRegularExpressions) const
{
switch (aFilterOperator)
@@ -283,294 +208,6 @@ void ScXMLExportDatabaseRanges::WriteCondition(const sheet::TableFilterField2& a
SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, true, true);
}
-void ScXMLExportDatabaseRanges::WriteFilterDescriptor(const uno::Reference <sheet::XSheetFilterDescriptor2>& xSheetFilterDescriptor, const rtl::OUString sDatabaseRangeName)
-{
- uno::Sequence< sheet::TableFilterField2 > aTableFilterFields( xSheetFilterDescriptor->getFilterFields2() );
- sal_Int32 nTableFilterFields = aTableFilterFields.getLength();
- if (nTableFilterFields > 0)
- {
- uno::Reference <beans::XPropertySet> xPropertySet (xSheetFilterDescriptor, uno::UNO_QUERY);
- if (xPropertySet.is())
- {
- if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_COPYOUT)))))
- {
- table::CellAddress aOutputPosition;
- if (xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_OUTPOS))) >>= aOutputPosition)
- {
- rtl::OUString sOUCellAddress;
- ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc, ::formula::FormulaGrammar::CONV_OOO );
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUCellAddress);
- }
- }
- ScDBCollection* pDBCollection = pDoc->GetDBCollection();
- ScDBData* pDBData = pDBCollection->getNamedDBs().findByName(sDatabaseRangeName);
- ScRange aAdvSource;
- if (pDBData->GetAdvancedQuerySource(aAdvSource))
- {
- rtl::OUString sOUCellAddress;
- ScRangeStringConverter::GetStringFromRange( sOUCellAddress, aAdvSource, pDoc, ::formula::FormulaGrammar::CONV_OOO );
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, sOUCellAddress);
- }
-
- if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SKIPDUP)))))
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_FALSE);
- SvXMLElementExport aElemF(rExport, XML_NAMESPACE_TABLE, XML_FILTER, true, true);
- rExport.CheckAttrList();
- bool bIsCaseSensitive = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE))));
- bool bUseRegularExpressions = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_USEREGEX))));
- bool bAnd = false;
- bool bOr = false;
- for (sal_Int32 i = 1; i < nTableFilterFields; ++i)
- {
- if (aTableFilterFields[i].Connection == sheet::FilterConnection_AND)
- bAnd = true;
- else
- bOr = true;
- }
- if (bOr && !bAnd)
- {
- SvXMLElementExport aElemOr(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, true, true);
- for (sal_Int32 i = 0; i < nTableFilterFields; ++i)
- {
- WriteCondition(aTableFilterFields[i], bIsCaseSensitive, bUseRegularExpressions);
- }
- }
- else if (bAnd && !bOr)
- {
- SvXMLElementExport aElemAnd(rExport, XML_NAMESPACE_TABLE, XML_FILTER_AND, true, true);
- for (sal_Int32 i = 0; i < nTableFilterFields; ++i)
- {
- WriteCondition(aTableFilterFields[i], bIsCaseSensitive, bUseRegularExpressions);
- }
- }
- else if (nTableFilterFields == 1)
- {
- WriteCondition(aTableFilterFields[0], bIsCaseSensitive, bUseRegularExpressions);
- }
- else
- {
- SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_FILTER_OR, true, true);
- sheet::TableFilterField2 aPrevFilterField = aTableFilterFields[0];
- sheet::FilterConnection aConnection = aTableFilterFields[1].Connection;
- bool bOpenAndElement;
- rtl::OUString aName = rExport.GetNamespaceMap().GetQNameByKey(XML_NAMESPACE_TABLE, GetXMLToken(XML_FILTER_AND));
- if (aConnection == sheet::FilterConnection_AND)
- {
- rExport.StartElement( aName, true);
- bOpenAndElement = true;
- }
- else
- bOpenAndElement = false;
- for (sal_Int32 i = 1; i < nTableFilterFields; ++i)
- {
- if (aConnection != aTableFilterFields[i].Connection)
- {
- aConnection = aTableFilterFields[i].Connection;
- if (aTableFilterFields[i].Connection == sheet::FilterConnection_AND)
- {
- rExport.StartElement( aName, true );
- bOpenAndElement = true;
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- aPrevFilterField = aTableFilterFields[i];
- if (i == nTableFilterFields - 1)
- {
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- rExport.EndElement(aName, true);
- bOpenAndElement = false;
- }
- }
- else
- {
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- aPrevFilterField = aTableFilterFields[i];
- if (bOpenAndElement)
- {
- rExport.EndElement(aName, true);
- bOpenAndElement = false;
- }
- if (i == nTableFilterFields - 1)
- {
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- }
- }
- }
- else
- {
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- aPrevFilterField = aTableFilterFields[i];
- if (i == nTableFilterFields - 1)
- WriteCondition(aPrevFilterField, bIsCaseSensitive, bUseRegularExpressions);
- }
- }
- if(bOpenAndElement)
- rExport.EndElement(aName, true);
- }
- }
- }
-}
-
-void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans::PropertyValue> aSortProperties)
-{
- uno::Sequence <table::TableSortField> aSortFields;
- bool bBindFormatsToContent (true);
- bool bCopyOutputData (false);
- bool bIsUserListEnabled (false);
- table::CellAddress aOutputPosition;
- sal_Int32 nUserListIndex = 0;
- sal_Int32 nProperties = aSortProperties.getLength();
- sal_Int32 i;
- for (i = 0; i < nProperties; ++i)
- {
- if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_BINDFMT) == 0)
- bBindFormatsToContent = ::cppu::any2bool(aSortProperties[i].Value);
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COPYOUT) == 0)
- bCopyOutputData = ::cppu::any2bool(aSortProperties[i].Value);
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISULIST) == 0)
- bIsUserListEnabled = ::cppu::any2bool(aSortProperties[i].Value);
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_OUTPOS) == 0)
- aSortProperties[i].Value >>= aOutputPosition;
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_UINDEX) == 0)
- aSortProperties[i].Value >>= nUserListIndex;
- else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_SORTFLD) == 0)
- aSortProperties[i].Value >>= aSortFields;
- }
- sal_Int32 nSortFields = aSortFields.getLength();
- if (nSortFields > 0)
- {
- if (!bBindFormatsToContent)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_FALSE);
- if (bCopyOutputData)
- {
- rtl::OUString sOUCellAddress;
- ScRangeStringConverter::GetStringFromAddress( sOUCellAddress, aOutputPosition, pDoc, ::formula::FormulaGrammar::CONV_OOO );
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUCellAddress);
- }
-
- if (aSortFields[0].IsCaseSensitive)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
-#if OSL_DEBUG_LEVEL > 0
- bool bCaseSensitive(aSortFields[0].IsCaseSensitive);
- for (i = 1; i < nSortFields; ++i)
- {
- OSL_ENSURE(bCaseSensitive == (bool) aSortFields[i].IsCaseSensitive, "seems that it is now possible to have every field case sensitive");
- }
-#endif
- if (aSortFields[0].CollatorLocale.Language.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_LANGUAGE, aSortFields[0].CollatorLocale.Language);
- if (aSortFields[0].CollatorLocale.Country.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COUNTRY, aSortFields[0].CollatorLocale.Country);
- if (aSortFields[0].CollatorAlgorithm.getLength())
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ALGORITHM, aSortFields[0].CollatorAlgorithm);
-#if OSL_DEBUG_LEVEL > 0
- rtl::OUString sLanguage(aSortFields[0].CollatorLocale.Language);
- rtl::OUString sCountry(aSortFields[0].CollatorLocale.Country);
- rtl::OUString sAlgorithm(aSortFields[0].CollatorAlgorithm);
- for (i = 1; i < nSortFields; ++i)
- {
- OSL_ENSURE(sLanguage == aSortFields[i].CollatorLocale.Language, "seems that it is now possible to have every field localized");
- OSL_ENSURE(sCountry == aSortFields[i].CollatorLocale.Country, "seems that it is now possible to have every field localized");
- OSL_ENSURE(sAlgorithm == aSortFields[i].CollatorAlgorithm, "seems that it is now possible to have every field localized");
- }
-#endif
- SvXMLElementExport aElemS(rExport, XML_NAMESPACE_TABLE, XML_SORT, true, true);
- rExport.CheckAttrList();
- for (i = 0; i < nSortFields; ++i)
- {
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, rtl::OUString::valueOf(aSortFields[i].Field));
- if (!aSortFields[i].IsAscending)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORDER, XML_DESCENDING);
- if (!bIsUserListEnabled)
- {
- switch (aSortFields[i].FieldType)
- {
- case table::TableSortFieldType_ALPHANUMERIC :
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TEXT);
- break;
- case table::TableSortFieldType_AUTOMATIC :
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_AUTOMATIC);
- break;
- case table::TableSortFieldType_NUMERIC :
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_NUMBER);
- break;
- default:
- {
- // added to avoid warnings
- }
- }
- }
- else
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_USERLIST)) + rtl::OUString::valueOf(nUserListIndex));
- SvXMLElementExport aElemSb(rExport, XML_NAMESPACE_TABLE, XML_SORT_BY, true, true);
- rExport.CheckAttrList();
- }
- }
-}
-
-void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::uno::Reference <com::sun::star::sheet::XSubTotalDescriptor> xSubTotalDescriptor, const rtl::OUString sDatabaseRangeName)
-{
- uno::Reference <container::XIndexAccess> xIndexAccess (xSubTotalDescriptor, uno::UNO_QUERY);
- if (xIndexAccess.is())
- {
- sal_Int32 nSubTotalFields = xIndexAccess->getCount();
- if (nSubTotalFields > 0)
- {
- uno::Reference <beans::XPropertySet> xPropertySet (xSubTotalDescriptor, uno::UNO_QUERY);
- if (xPropertySet.is())
- {
- if (!::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT)))))
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_FALSE);
- if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_INSBRK)))))
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TRUE);
- if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE)))))
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE);
- }
- SvXMLElementExport aElemSTRs(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, true, true);
- rExport.CheckAttrList();
- {
- ScDBCollection* pDBCollection = pDoc->GetDBCollection();
- ScDBData* pDBData = pDBCollection->getNamedDBs().findByName(sDatabaseRangeName);
- ScSubTotalParam aSubTotalParam;
- pDBData->GetSubTotalParam(aSubTotalParam);
- if (aSubTotalParam.bDoSort)
- {
- if (!aSubTotalParam.bAscending)
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_ORDER, XML_DESCENDING);
- if (aSubTotalParam.bUserDef)
- {
- rtl::OUString sUserList(RTL_CONSTASCII_USTRINGPARAM(SC_USERLIST));
- sUserList += rtl::OUString::valueOf(aSubTotalParam.nUserIndex);
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_DATA_TYPE, sUserList);
- }
- SvXMLElementExport aElemSGs(rExport, XML_NAMESPACE_TABLE, XML_SORT_GROUPS, true, true);
- rExport.CheckAttrList();
- }
- }
- for (sal_Int32 i = 0; i < nSubTotalFields; ++i)
- {
- uno::Reference <sheet::XSubTotalField> xSubTotalField(xIndexAccess->getByIndex(i), uno::UNO_QUERY);
- if (xSubTotalField.is())
- {
- sal_Int32 nGroupColumn = xSubTotalField->getGroupColumn();
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, rtl::OUString::valueOf(nGroupColumn));
- SvXMLElementExport aElemSTR(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, true, true);
- rExport.CheckAttrList();
- uno::Sequence <sheet::SubTotalColumn> aSubTotalColumns = xSubTotalField->getSubTotalColumns();
- sal_Int32 nSubTotalColumns = aSubTotalColumns.getLength();
- for (sal_Int32 j = 0; j < nSubTotalColumns; ++j)
- {
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, rtl::OUString::valueOf(aSubTotalColumns[j].Column));
- rtl::OUString sFunction;
- ScXMLConverter::GetStringFromFunction( sFunction, aSubTotalColumns[j].Function );
- rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FUNCTION, sFunction);
- SvXMLElementExport aElemSTF(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, true, true);
- rExport.CheckAttrList();
- }
- }
- }
- }
- }
-}
-
namespace {
class WriteDatabaseRange : public ::std::unary_function<ScDBData, void>
diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
index 92690d2..425cdf8 100644
--- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
+++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx
@@ -46,12 +46,8 @@ class ScXMLExportDatabaseRanges
ScXMLExport& rExport;
ScDocument* pDoc;
- void WriteImportDescriptor(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aImportDescriptor);
rtl::OUString getOperatorXML(const long aFilterOperator, const bool bUseRegularExpressions) const;
void WriteCondition(const com::sun::star::sheet::TableFilterField2& aFilterField, bool bIsCaseSensitive, bool bUseRegularExpressions);
- void WriteFilterDescriptor(const com::sun::star::uno::Reference <com::sun::star::sheet::XSheetFilterDescriptor2>& xSheetFilterDescriptor, const rtl::OUString sDatabaseRangeName);
- void WriteSortDescriptor(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortProperties);
- void WriteSubTotalDescriptor(const com::sun::star::uno::Reference <com::sun::star::sheet::XSubTotalDescriptor> xSubTotalDescriptor, const rtl::OUString sDatabaseRangeName);
public:
ScXMLExportDatabaseRanges(ScXMLExport& rExport);
~ScXMLExportDatabaseRanges();
diff --git a/unusedcode.easy b/unusedcode.easy
index f518828..d1f026f 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -474,16 +474,9 @@ ScVbaShapes::AddShape(rtl::OUString const&, rtl::OUString const&, int, int, int,
ScVbaWindows::ScVbaWindows(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&, com::sun::star::uno::Reference<com::sun::star::container::XIndexAccess> const&)
ScVbaWorksheet::ScVbaWorksheet(com::sun::star::uno::Reference<ooo::vba::XHelperInterface> const&, com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
ScXMLExportDDELinks::CellsEqual(bool, bool, String const&, double const&, bool, bool, String const&, double const&) const
-ScXMLExportDatabaseRanges::WriteFilterDescriptor(com::sun::star::uno::Reference<com::sun::star::sheet::XSheetFilterDescriptor2> const&, rtl::OUString)
-ScXMLExportDatabaseRanges::WriteImportDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>)
-ScXMLExportDatabaseRanges::WriteSortDescriptor(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>)
-ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(com::sun::star::uno::Reference<com::sun::star::sheet::XSubTotalDescriptor>, rtl::OUString)
ScaList::Insert(void*, unsigned int)
SchXMLExport::SetProgress(int)
SchXMLExportHelper_Impl::getCellAddress(int, int)
-SchXMLImport::SchXMLImport(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&, com::sun::star::uno::Reference<com::sun::star::frame::XModel>, com::sun::star::uno::Reference<com::sun::star::document::XGraphicObjectResolver>&, unsigned char, unsigned char)
-SchXMLImportHelper::GetAutoStyleAttrTokenMap()
-SchXMLImportHelper::GetNewLabeledDataSequence()
SchXMLPositonAttributesHelper::getPosition() const
SchXMLPositonAttributesHelper::getSize() const
SchXMLSeriesHelper::getFirstCandleStickSeries(com::sun::star::uno::Reference<com::sun::star::chart2::XDiagram> const&)
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index 11b90ca..5ac793d 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -177,13 +177,6 @@ public:
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
sal_uInt16 nImportFlags = IMPORT_ALL );
- // #110680#
- SchXMLImport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory,
- com::sun::star::uno::Reference< com::sun::star::frame::XModel > xModel,
- com::sun::star::uno::Reference< com::sun::star::document::XGraphicObjectResolver > &,
- sal_Bool bLoadDoc, sal_Bool bShowProgress );
-
virtual ~SchXMLImport() throw ();
// XServiceInfo ( : SvXMLExport )
diff --git a/xmloff/inc/xmloff/SchXMLImportHelper.hxx b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
index ea4c459..9c0ca34 100644
--- a/xmloff/inc/xmloff/SchXMLImportHelper.hxx
+++ b/xmloff/inc/xmloff/SchXMLImportHelper.hxx
@@ -124,7 +124,6 @@ public:
const SvXMLTokenMap& GetChartAttrTokenMap();
const SvXMLTokenMap& GetPlotAreaAttrTokenMap();
- const SvXMLTokenMap& GetAutoStyleAttrTokenMap();
const SvXMLTokenMap& GetCellAttrTokenMap();
const SvXMLTokenMap& GetSeriesAttrTokenMap();
const SvXMLTokenMap& GetRegEquationAttrTokenMap();
@@ -156,9 +155,6 @@ public:
::com::sun::star::chart2::XDataSeries >& xSeries,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xDoc );
-
- static ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::data::XLabeledDataSequence > GetNewLabeledDataSequence();
};
#endif // _XMLOFF_SCH_XMLIMPORTHELPER_HXX_
diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx
index 6643b8a..645a60b 100644
--- a/xmloff/source/chart/SchXMLImport.cxx
+++ b/xmloff/source/chart/SchXMLImport.cxx
@@ -367,23 +367,6 @@ const SvXMLTokenMap& SchXMLImportHelper::GetPlotAreaAttrTokenMap()
return *mpPlotAreaAttrTokenMap;
}
-const SvXMLTokenMap& SchXMLImportHelper::GetAutoStyleAttrTokenMap()
-{
- if( ! mpAutoStyleAttrTokenMap )
- {
- static SvXMLTokenMapEntry aAutoStyleAttrTokenMap[] =
-{
- { XML_NAMESPACE_STYLE, XML_FAMILY, XML_TOK_AS_FAMILY },
- { XML_NAMESPACE_STYLE, XML_NAME, XML_TOK_AS_NAME },
- XML_TOKEN_MAP_END
-};
-
- mpAutoStyleAttrTokenMap = new SvXMLTokenMap( aAutoStyleAttrTokenMap );
- } // if( ! mpAutoStyleAttrTokenMap )
-
- return *mpAutoStyleAttrTokenMap;
-}
-
const SvXMLTokenMap& SchXMLImportHelper::GetCellAttrTokenMap()
{
if( ! mpCellAttrTokenMap )
@@ -575,16 +558,6 @@ Reference< chart2::XDataSeries > SchXMLImportHelper::GetNewDataSeries(
return xResult;
}
-// static
-Reference< chart2::data::XLabeledDataSequence > SchXMLImportHelper::GetNewLabeledDataSequence()
-{
- // @todo: remove this asap
- OSL_FAIL( "Do not call this method" );
- Reference< chart2::data::XLabeledDataSequence > xResult;
- // DO NOT USED -- DEPRECATED. Use SchXMLTools::GetNewLabeledDataSequence() instead
- return xResult;
-}
-
// ========================================
// #110680#
@@ -599,43 +572,6 @@ SchXMLImport::SchXMLImport(
mbIsGraphicLoadOnDemandSupported = false;
}
-// #110680#
-SchXMLImport::SchXMLImport(
- const Reference< lang::XMultiServiceFactory >& xServiceFactory,
- Reference< frame::XModel > xModel,
- Reference< document::XGraphicObjectResolver >& rGrfContainer,
- sal_Bool /*bLoadDoc*/, sal_Bool bShowProgress )
-: SvXMLImport( xServiceFactory, xModel, rGrfContainer )
-{
- GetNamespaceMap().Add( GetXMLToken(XML_NP_XLINK), GetXMLToken(XML_N_XLINK), XML_NAMESPACE_XLINK );
- GetNamespaceMap().Add( GetXMLToken(XML_NP_CHART_EXT), GetXMLToken(XML_N_CHART_EXT), XML_NAMESPACE_CHART_EXT);
-
- // get status indicator (if requested)
- if( bShowProgress )
- {
- Reference< frame::XController > xController( xModel->getCurrentController());
- if( xController.is())
- {
- Reference< frame::XFrame > xFrame( xController->getFrame());
- if( xFrame.is())
- {
- Reference< task::XStatusIndicatorSupplier > xFactory( xFrame, uno::UNO_QUERY );
- if( xFactory.is())
- {
- mxStatusIndicator = xFactory->getStatusIndicator();
- }
- }
- }
- }
-
- // add progress view
- if( mxStatusIndicator.is())
- {
- const OUString aText( RTL_CONSTASCII_USTRINGPARAM( "XML Import" ));
- mxStatusIndicator->start( aText, 100 ); // use percentage as values
- }
-}
-
SchXMLImport::~SchXMLImport() throw ()
{
// stop progress view
commit 87b8377ab22fbcf444f7c8349e69ad1a77f03f6b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Nov 2 22:12:16 2011 +0000
ByteString->rtl::OString
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index 88c04f4..b6c88be 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -94,7 +94,7 @@ void SwCache::Check()
SwCache::SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize
#if OSL_DEBUG_LEVEL > 1
- , const ByteString &rNm
+ , const rtl::OString &rNm
#endif
) :
SwCacheObjArr( (sal_uInt8)nInitSize, (sal_uInt8)nGrowSize ),
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index a5cd9a5..12edea0 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -58,7 +58,7 @@
using namespace std;
-static ByteString aDbgOutResult;
+static rtl::OString aDbgOutResult;
bool bDbgOutStdErr = false;
bool bDbgOutPrintAttrSet = false;
@@ -103,7 +103,7 @@ SW_DLLPUBLIC const char * dbg_out(const void * pVoid)
SW_DLLPUBLIC const char * dbg_out(const String & aStr)
{
- aDbgOutResult = ByteString(aStr, RTL_TEXTENCODING_ASCII_US);
+ aDbgOutResult = rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US);
if (bDbgOutStdErr)
fprintf(stderr, "%s", aDbgOutResult.GetBuffer());
@@ -113,7 +113,7 @@ SW_DLLPUBLIC const char * dbg_out(const String & aStr)
SW_DLLPUBLIC const char * dbg_out(const ::rtl::OUString & aStr)
{
- aDbgOutResult = ByteString( rtl::OUStringToOString( aStr, RTL_TEXTENCODING_ASCII_US ) );
+ aDbgOutResult = rtl::OUStringToOString(aStr, RTL_TEXTENCODING_ASCII_US);
return aDbgOutResult.GetBuffer();
}
diff --git a/sw/source/core/inc/fntcache.hxx b/sw/source/core/inc/fntcache.hxx
index 39a739a..c11f862 100644
--- a/sw/source/core/inc/fntcache.hxx
+++ b/sw/source/core/inc/fntcache.hxx
@@ -53,7 +53,7 @@ public:
inline SwFntCache() : SwCache(50,50
#if OSL_DEBUG_LEVEL > 1
- , ByteString( RTL_CONSTASCII_STRINGPARAM(
+ , rtl::OString( RTL_CONSTASCII_STRINGPARAM(
"Globaler Font-Cache pFntCache" ))
#endif
) {}
diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx
index d609ad8..6273764 100644
--- a/sw/source/core/inc/swcache.hxx
+++ b/sw/source/core/inc/swcache.hxx
@@ -92,7 +92,7 @@ class SwCache : public SwCacheObjArr
void DeleteObj( SwCacheObj *pObj );
#if OSL_DEBUG_LEVEL > 1
- ByteString aName;
+ rtl::OString aName;
long nAppend; //Anzahl der Eintragungen durch Erweiterung.
long nInsertFree; //Anzahl der Eintragungen auf freie Plaetze.
long nReplace; //Anzahl der Ersetzungen durch ein neues Objekt
@@ -115,7 +115,7 @@ public:
//nur sal_uInt8 hineinstecken!!!
#if OSL_DEBUG_LEVEL > 1
SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize,
- const ByteString &rNm );
+ const rtl::OString &rNm );
~SwCache();
#else
SwCache( const sal_uInt16 nInitSize, const sal_uInt16 nGrowSize );
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx
index 33bd07a..157a106 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -701,12 +701,13 @@ void SwHTMLWriter::OutStyleSheet( const SwPageDesc& rPageDesc, sal_Bool bUsed )
// wenn pPseudo gesetzt ist werden Styles-Sheets ausgegeben,
// sonst wird nur nach Token und Class fuer ein Format gesucht
-sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
+sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToken,
String& rClass, sal_uInt16& rRefPoolId,
String *pPseudo )
{
sal_uInt16 nDeep = 0;
- rToken.Erase(); rClass.Erase();
+ rToken = rtl::OString();
+ rClass.Erase();
rRefPoolId = 0;
if( pPseudo )
pPseudo->Erase();
@@ -737,7 +738,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
case 'B': if( !bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_blockquote) )
{
rRefPoolId = RES_POOLCOLL_HTML_BLOCKQUOTE;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_blockquote );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_blockquote);
}
break;
case 'C': if( bChrFmt )
@@ -745,19 +746,19 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_citiation) )
{
rRefPoolId = RES_POOLCHR_HTML_CITIATION;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_citiation );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_citiation);
}
else if( rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_code) )
{
rRefPoolId = RES_POOLCHR_HTML_CODE;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_code );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_code);
}
}
break;
case 'D': if( bChrFmt && rNm.EqualsAscii(OOO_STRING_SVTOOLS_HTML_definstance) )
{
rRefPoolId = RES_POOLCHR_HTML_DEFINSTANCE;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_definstance);
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_definstance);
}
else if( !bChrFmt )
{
@@ -775,12 +776,12 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
else if( nDefListLvl & HTML_DLCOLL_DD )
{
rRefPoolId = RES_POOLCOLL_HTML_DD;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_dd );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dd);
}
else
{
rRefPoolId = RES_POOLCOLL_HTML_DT;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_dt );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dt);
}
}
}
@@ -788,7 +789,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
case 'E': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_emphasis ) )
{
rRefPoolId = RES_POOLCHR_HTML_EMPHASIS;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_emphasis );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_emphasis);
}
break;
case 'H': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_horzrule ) )
@@ -798,14 +799,14 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
case 'K': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_keyboard ) )
{
rRefPoolId = RES_POOLCHR_HTML_KEYBOARD;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_keyboard );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_keyboard);
}
break;
case 'L': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_listing ) )
{
// Listing als PRE exportieren bzw. von
// PRE abgeleitete Vorlage exportieren
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_preformtxt );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
rRefPoolId = RES_POOLCOLL_HTML_PRE;
nDeep = CSS1_FMT_CMPREF;
}
@@ -813,7 +814,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
case 'P': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_preformtxt ) )
{
rRefPoolId = RES_POOLCOLL_HTML_PRE;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_preformtxt );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
}
break;
case 'S': if( bChrFmt )
@@ -821,32 +822,32 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
if( rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_sample ) )
{
rRefPoolId = RES_POOLCHR_HTML_SAMPLE;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_sample );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_sample);
}
else if( rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_strong ) )
{
rRefPoolId = RES_POOLCHR_HTML_STRONG;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_strong );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_strong);
}
}
break;
case 'T': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_teletype ) )
{
rRefPoolId = RES_POOLCHR_HTML_TELETYPE;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_teletype );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_teletype);
}
break;
case 'V': if( bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_variable ) )
{
rRefPoolId = RES_POOLCHR_HTML_VARIABLE;
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_variable );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_variable);
}
break;
case 'X': if( !bChrFmt && rNm.EqualsAscii( OOO_STRING_SVTOOLS_HTML_xmp ) )
{
// XMP als PRE exportieren (aber nicht die
// Vorlage als Style)
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_preformtxt );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
rRefPoolId = RES_POOLCOLL_HTML_PRE;
nDeep = CSS1_FMT_CMPREF;
}
@@ -855,7 +856,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
// Wenn eine PoolId gesetzt ist, entspricht der Name der
// Vorlage dem szugehoerigen Token
- OSL_ENSURE( (rRefPoolId != 0) == (rToken.Len() > 0),
+ OSL_ENSURE( (rRefPoolId != 0) == (rToken.getLength() > 0),
"Token missing" );
}
else
@@ -870,41 +871,41 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
bStop = (nDeep==0);
break;
case RES_POOLCOLL_TEXT:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak);
break;
case RES_POOLCOLL_HEADLINE1:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_head1 );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head1);
break;
case RES_POOLCOLL_HEADLINE2:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_head2 );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head2);
break;
case RES_POOLCOLL_HEADLINE3:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_head3 );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head3);
break;
case RES_POOLCOLL_HEADLINE4:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_head4 );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head4);
break;
case RES_POOLCOLL_HEADLINE5:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_head5 );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head5);
break;
case RES_POOLCOLL_HEADLINE6:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_head6 );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_head6);
break;
case RES_POOLCOLL_SENDADRESS:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_address );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_address);
break;
case RES_POOLCOLL_HTML_BLOCKQUOTE:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_blockquote );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_blockquote);
break;
case RES_POOLCOLL_HTML_PRE:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_preformtxt );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_preformtxt);
break;
case RES_POOLCOLL_HTML_DD:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_dd );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dd);
break;
case RES_POOLCOLL_HTML_DT:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_dt );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_dt);
break;
case RES_POOLCOLL_TABLE:
@@ -917,7 +918,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
.makeStringAndClear();
}
else
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak);
break;
case RES_POOLCOLL_TABLE_HDLN:
if( pPseudo )
@@ -929,7 +930,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
.makeStringAndClear();
}
else
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak);
break;
case RES_POOLCOLL_HTML_HR:
// HR nicht ausgeben!
@@ -938,7 +939,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
case RES_POOLCOLL_FOOTNOTE:
if( !nDeep )
{
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak);
rClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdfootnote );
rRefPoolId = RES_POOLCOLL_TEXT;
nDeep = CSS1_FMT_CMPREF;
@@ -947,7 +948,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
case RES_POOLCOLL_ENDNOTE:
if( !nDeep )
{
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_parabreak );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_parabreak);
rClass.AssignAscii( OOO_STRING_SVTOOLS_HTML_sdendnote );
rRefPoolId = RES_POOLCOLL_TEXT;
nDeep = CSS1_FMT_CMPREF;
@@ -956,44 +957,44 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
// Zeichen-Vorlagen
case RES_POOLCHR_HTML_EMPHASIS:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_emphasis );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_emphasis);
break;
case RES_POOLCHR_HTML_CITIATION:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_citiation );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_citiation);
break;
case RES_POOLCHR_HTML_STRONG:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_strong );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_strong);
break;
case RES_POOLCHR_HTML_CODE:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_code );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_code);
break;
case RES_POOLCHR_HTML_SAMPLE:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_sample );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_sample);
break;
case RES_POOLCHR_HTML_KEYBOARD:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_keyboard );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_keyboard);
break;
case RES_POOLCHR_HTML_VARIABLE:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_variable );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_variable);
break;
case RES_POOLCHR_HTML_DEFINSTANCE:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_definstance );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_definstance);
break;
case RES_POOLCHR_HTML_TELETYPE:
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_teletype );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_teletype);
break;
case RES_POOLCHR_INET_NORMAL:
if( pPseudo )
{
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_anchor );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_anchor);
pPseudo->AssignAscii( sCSS1_link );
}
break;
case RES_POOLCHR_INET_VISIT:
if( pPseudo )
{
- rToken.Assign( OOO_STRING_SVTOOLS_HTML_anchor );
+ rToken = rtl::OString(OOO_STRING_SVTOOLS_HTML_anchor);
pPseudo->AssignAscii( sCSS1_visited );
}
break;
@@ -1001,11 +1002,11 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
// Wenn ein Token gesetzt ist, enthaelt nPoolId die dazugehoerige
// Vorlage
- if( rToken.Len() && !rRefPoolId )
+ if( rToken.getLength() && !rRefPoolId )
rRefPoolId = nPoolId;
}
- if( rToken.Len() || bStop )
+ if( rToken.getLength() || bStop )
{
// Anhalten wenn eine HTML-Tag-Vorlage gefunden wurde
break;
@@ -1018,7 +1019,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
}
}
- if( rToken.Len() )
+ if( rToken.getLength() )
{
// Es ist eine HTML-Tag-Vorlage
if( !nDeep )
@@ -1057,7 +1058,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, String& rSelector,
sal_uInt16& rRefPoolId )
{
- ByteString aToken;
+ rtl::OString aToken;
String aClass;
String aPseudo;
@@ -1065,7 +1066,7 @@ static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, String& rSelector,
rRefPoolId, &aPseudo );
if( nDeep )
{
- if( aToken.Len() )
+ if( aToken.getLength() )
rSelector = String( aToken, RTL_TEXTENCODING_ASCII_US );
else
rSelector.Erase();
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 7354b6c..7b796a5 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -272,7 +272,7 @@ sal_uInt16 SwHTMLWriter::GetCSS1ScriptForScriptType( sal_uInt16 nScriptType )
struct SwHTMLTxtCollOutputInfo
{
- ByteString aToken; // auszugendens End-Token
+ rtl::OString aToken; // auszugendens End-Token
SfxItemSet *pItemSet; // harte Attributierung
sal_Bool bInNumBulList; // in einer Aufzaehlungs-Liste;
@@ -290,7 +290,7 @@ struct SwHTMLTxtCollOutputInfo
~SwHTMLTxtCollOutputInfo();
- sal_Bool HasParaToken() const { return aToken.Len()==1 && aToken.GetChar(0)=='P'; }
+ sal_Bool HasParaToken() const { return aToken.getLength()==1 && aToken[0]=='P'; }
sal_Bool ShouldOutputToken() const { return bOutPara || !HasParaToken(); }
};
@@ -304,7 +304,7 @@ struct SwHTMLFmtInfo
const SwFmt *pFmt; // das Format selbst
const SwFmt *pRefFmt; // das Vergleichs-Format
- ByteString aToken; // das auszugebende Token
+ rtl::OString aToken; // das auszugebende Token
String aClass; // die auszugebende Klasse
SfxItemSet *pItemSet; // der auszugebende Attribut-Set
@@ -357,7 +357,7 @@ SwHTMLFmtInfo::SwHTMLFmtInfo( const SwFmt *pF, SwDoc *pDoc, SwDoc *pTemplate,
// Den Selektor des Formats holen
sal_uInt16 nDeep = SwHTMLWriter::GetCSS1Selector( pFmt, aToken, aClass,
nRefPoolId );
- OSL_ENSURE( nDeep ? aToken.Len()>0 : aToken.Len()==0,
+ OSL_ENSURE( nDeep ? aToken.getLength()>0 : aToken.getLength()==0,
"Hier stimmt doch was mit dem Token nicht!" );
OSL_ENSURE( nDeep ? nRefPoolId : !nRefPoolId,
"Hier stimmt doch was mit der Vergleichs-Vorlage nicht!" );
@@ -658,34 +658,34 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// Jetzt wird festgelegt, was aufgrund des Tokens so moeglich ist
sal_uInt16 nToken = 0; // Token fuer Tag-Wechsel
sal_Bool bOutNewLine = sal_False; // nur ein LF ausgeben?
- if( pFmtInfo->aToken.Len() )
+ if( pFmtInfo->aToken.getLength() )
{
// Es ist eine HTML-Tag-Vorlage oder die Vorlage ist von einer
// solchen abgeleitet
rInfo.aToken = pFmtInfo->aToken;
// der erste Buchstabe reicht meistens
- switch( rInfo.aToken.GetChar( 0 ) )
+ switch( rInfo.aToken[0] )
{
- case 'A': OSL_ENSURE( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_address),
+ case 'A': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_address)),
"Doch kein ADDRESS?" );
rInfo.bParaPossible = sal_True;
rHWrt.bNoAlign = sal_True;
break;
- case 'B': OSL_ENSURE( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_blockquote),
+ case 'B': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_blockquote)),
"Doch kein BLOCKQUOTE?" );
rInfo.bParaPossible = sal_True;
rHWrt.bNoAlign = sal_True;
break;
- case 'P': if( rInfo.aToken.Len() == 1 )
+ case 'P': if( rInfo.aToken.getLength() == 1 )
{
bPara = sal_True;
}
else
{
- OSL_ENSURE( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_preformtxt),
+ OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_preformtxt)),
"Doch kein PRE?" );
if( HTML_PREFORMTXT_ON == rHWrt.nLastParaToken )
{
@@ -700,10 +700,10 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
}
break;
- case 'D': OSL_ENSURE( rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dt) ||
- rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dd),
+ case 'D': OSL_ENSURE( rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)) ||
+ rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dd)),
"Doch kein DD/DT?" );
- bDT = rInfo.aToken.Equals(OOO_STRING_SVTOOLS_HTML_dt);
+ bDT = rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt));
rInfo.bParaPossible = !bDT;
rHWrt.bNoAlign = sal_True;
bForceDL = sal_True;
@@ -768,7 +768,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
{
// nur einen Zeilen-Umbruch (ohne Einrueckung) am Absatz-Anfang
// ausgeben
- rInfo.aToken.Erase(); // kein End-Tag ausgeben
+ rInfo.aToken = rtl::OString(); // kein End-Tag ausgeben
rWrt.Strm() << SwHTMLWriter::sNewLine;
return;
@@ -969,7 +969,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
if( !rHWrt.bCfgOutStyles && rInfo.bParaPossible && !bPara &&
(bHasParSpace || pAdjItem) )
{
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.GetBuffer() );
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr() );
aToken = OOO_STRING_SVTOOLS_HTML_parabreak;
bPara = sal_True;
rHWrt.bNoAlign = sal_False;
@@ -1090,7 +1090,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
// wenn kein End-Tag geschrieben werden soll, es loeschen
if( bNoEndTag )
- rInfo.aToken.Erase();
+ rInfo.aToken = rtl::OString();
}
// ??? Warum nicht ueber den Hint-Mechanismus ???
@@ -1133,7 +1133,7 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
SwHTMLWriter & rHWrt = (SwHTMLWriter&)rWrt;
// wenn es kein Token gibt haben wir auch nichts auszugeben
- if( !rInfo.aToken.Len() )
+ if( !rInfo.aToken.getLength() )
{
rHWrt.FillNextNumInfo();
const SwHTMLNumRuleInfo& rNextInfo = *rHWrt.GetNextNumInfo();
@@ -1166,11 +1166,12 @@ void OutHTML_SwFmtOff( Writer& rWrt, const SwHTMLTxtCollOutputInfo& rInfo )
if( rInfo.bParaPossible && rInfo.bOutPara )
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_parabreak, sal_False );
- HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.GetBuffer(),
+ HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), rInfo.aToken.getStr(),
sal_False );
- rHWrt.bLFPossible = !rInfo.aToken.Equals( OOO_STRING_SVTOOLS_HTML_dt ) &&
- !rInfo.aToken.Equals( OOO_STRING_SVTOOLS_HTML_dd ) &&
- !rInfo.aToken.Equals( OOO_STRING_SVTOOLS_HTML_li );
+ rHWrt.bLFPossible =
+ !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dt)) &&
+ !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_dd)) &&
+ !rInfo.aToken.equalsL(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_li));
}
if( rInfo.bOutDiv )
{
@@ -1852,7 +1853,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
const SwCharFmt* pFmt = rChrFmt.GetCharFmt();
const SwHTMLFmtInfo *pFmtInfo = GetFmtInfo( *pFmt, rFmtInfos );
- if( pFmtInfo->aToken.Len() )
+ if( pFmtInfo->aToken.getLength() )
{
// das Zeichenvorlagen-Tag muss vor den harten
// Attributen ausgegeben werden
@@ -3245,7 +3246,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
{
rtl::OStringBuffer sOut;
sOut.append('<');
- if( pFmtInfo->aToken.Len() > 0 )
+ if( pFmtInfo->aToken.getLength() > 0 )
sOut.append(pFmtInfo->aToken);
else
sOut.append(OOO_STRING_SVTOOLS_HTML_span);
@@ -3283,7 +3284,7 @@ static Writer& OutHTML_SwTxtCharFmt( Writer& rWrt, const SfxPoolItem& rHt )
else
{
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
- pFmtInfo->aToken.Len() ? pFmtInfo->aToken.GetBuffer()
+ pFmtInfo->aToken.getLength() ? pFmtInfo->aToken.getStr()
: OOO_STRING_SVTOOLS_HTML_span,
sal_False );
}
diff --git a/sw/source/filter/html/wrthtml.hxx b/sw/source/filter/html/wrthtml.hxx
index 537aab8..a493c21 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -381,8 +381,6 @@ public:
inline void OutCSS1_PropertyAscii( const sal_Char *pProp,
const sal_Char *pVal );
inline void OutCSS1_PropertyAscii( const sal_Char *pProp,
- const ByteString& rVal );
- inline void OutCSS1_PropertyAscii( const sal_Char *pProp,
const rtl::OString& rVal );
inline void OutCSS1_Property( const sal_Char *pProp, const String& rVal );
void OutCSS1_Property( const sal_Char *pProp, const sal_Char *pVal,
@@ -458,7 +456,7 @@ public:
static const SdrObject *GetHTMLControl( const SwDrawFrmFmt& rFmt );
static const SdrObject *GetMarqueeTextObj( const SwDrawFrmFmt& rFmt );
- static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, ByteString& rToken,
+ static sal_uInt16 GetCSS1Selector( const SwFmt *pFmt, rtl::OString& rToken,
String& rClass, sal_uInt16& rRefPoolId,
String *pPseudo=0 );
@@ -512,12 +510,6 @@ inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp,
}
inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp,
- const ByteString& rVal )
-{
- OutCSS1_Property( pProp, rVal.GetBuffer(), 0 );
-}
-
-inline void SwHTMLWriter::OutCSS1_PropertyAscii( const sal_Char *pProp,
const rtl::OString& rVal )
{
OutCSS1_Property( pProp, rVal.getStr(), 0 );
More information about the Libreoffice-commits
mailing list