[Libreoffice-commits] .: 8 commits - comphelper/inc desktop/source lotuswordpro/source sfx2/inc sfx2/source sot/source svl/inc svl/source svtools/inc svtools/source svx/source unusedcode.easy vcl/unx
Caolán McNamara
caolan at kemper.freedesktop.org
Wed Aug 17 01:54:46 PDT 2011
comphelper/inc/comphelper/string.hxx | 23
desktop/source/deployment/registry/configuration/dp_configuration.cxx | 10
lotuswordpro/source/filter/lwplayout.cxx | 7
lotuswordpro/source/filter/lwplayout.hxx | 1
lotuswordpro/source/filter/lwplaypiece.hxx | 1
lotuswordpro/source/filter/lwpobjid.cxx | 36 -
lotuswordpro/source/filter/lwpobjid.hxx | 2
lotuswordpro/source/filter/lwpobjstrm.cxx | 11
lotuswordpro/source/filter/lwpobjstrm.hxx | 1
sfx2/inc/resmgr.hxx | 3
sfx2/inc/sfx2/app.hxx | 2
sfx2/inc/sfx2/docfile.hxx | 2
sfx2/inc/sfx2/doctdlg.hxx | 2
sfx2/inc/sfx2/doctempl.hxx | 14
sfx2/inc/sfx2/mnuitem.hxx | 1
sfx2/inc/sfx2/mnumgr.hxx | 4
sfx2/source/appl/app.cxx | 14
sfx2/source/appl/appmisc.cxx | 1
sfx2/source/doc/docfile.cxx | 14
sfx2/source/doc/doctdlg.cxx | 19
sfx2/source/doc/doctempl.cxx | 302 ----------
sfx2/source/menu/mnuitem.cxx | 30
sfx2/source/menu/mnumgr.cxx | 78 --
sot/source/sdstor/stgelem.cxx | 13
sot/source/sdstor/stgelem.hxx | 2
svl/inc/svl/filerec.hxx | 28
svl/source/filerec/filerec.cxx | 39 -
svtools/inc/svtools/calendar.hxx | 1
svtools/inc/svtools/valueset.hxx | 1
svtools/source/control/calendar.cxx | 11
svtools/source/control/valueset.cxx | 89 --
svtools/source/filter/FilterConfigCache.cxx | 4
svx/source/form/fmvwimp.cxx | 33 -
unusedcode.easy | 42 -
vcl/unx/generic/printer/jobdata.cxx | 60 +
vcl/unx/generic/printer/printerinfomanager.cxx | 119 ++-
36 files changed, 151 insertions(+), 869 deletions(-)
New commits:
commit 0c571e233f8824ab0ccd907e72dd8a81527f0998
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 09:53:41 2011 +0100
add and use a matchL
diff --git a/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx
index c576a24..3e74ca4 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.hxx
@@ -162,6 +162,29 @@ COMPHELPER_DLLPUBLIC inline rtl::OUString getToken(const rtl::OUString &rIn,
return rIn.getToken(nToken, cTok, nIndex);
}
+/**
+ Match against a substring appearing in another string.
+
+ The result is true if and only if the second string appears as a substring
+ of the first string, at the given position.
+ This function can't be used for language specific comparison.
+
+ @param rStr The string that pMatch will be compared to.
+ @param pMatch The substring rStr is to be compared against
+ @param nMatchLen The length of pMatch
+ @param fromIndex The index to start the comparion from.
+ The index must be greater or equal than 0
+ and less or equal as the string length.
+ @return sal_True if pMatch match with the characters in the string
+ at the given position;
+ sal_False, otherwise.
+*/
+COMPHELPER_DLLPUBLIC inline sal_Bool matchL(const rtl::OString& rStr, const char *pMatch, sal_Int32 nMatchLen, sal_Int32 fromIndex = 0) SAL_THROW(())
+{
+ return rtl_str_shortenedCompare_WithLength( rStr.pData->buffer+fromIndex,
+ rStr.pData->length-fromIndex, pMatch, nMatchLen, nMatchLen ) == 0;
+}
+
/** Convert a sequence of strings to a single comma separated string.
Note that no escaping of commas or anything fancy is done.
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 7f27d85..a0b6872 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -36,6 +36,7 @@
#include <sal/alloca.h>
#include <rtl/strbuf.hxx>
+#include <comphelper/string.hxx>
using namespace psp;
@@ -187,7 +188,7 @@ bool JobData::getStreamBuffer( void*& pData, int& bytes )
bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobData )
{
SvMemoryStream aStream( pData, bytes, STREAM_READ );
- ByteString aLine;
+ rtl::OString aLine;
bool bVersion = false;
bool bPrinter = false;
bool bOrientation = false;
@@ -208,56 +209,59 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
const char pslevelEquals[] = "pslevel=";
const char pdfdeviceEquals[] = "pdfdevice=";
+ using comphelper::string::matchL;
+
while( ! aStream.IsEof() )
{
aStream.ReadLine( aLine );
- if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM("JobData")) == COMPARE_EQUAL )
+ if (matchL(aLine, RTL_CONSTASCII_STRINGPARAM("JobData")))
bVersion = true;
- else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(printerEquals)) == COMPARE_EQUAL )
+ else if (matchL(aLine, RTL_CONSTASCII_STRINGPARAM(printerEquals)))
{
bPrinter = true;
- rJobData.m_aPrinterName = String( aLine.Copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8 );
+ rJobData.m_aPrinterName = rtl::OStringToOUString(aLine.copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8);
}
- else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(orientatationEquals)) == COMPARE_EQUAL )
+ else if (matchL(aLine, RTL_CONSTASCII_STRINGPARAM(orientatationEquals)))
{
bOrientation = true;
- rJobData.m_eOrientation = aLine.Copy(RTL_CONSTASCII_LENGTH(orientatationEquals)).EqualsIgnoreCaseAscii( "landscape" ) ? orientation::Landscape : orientation::Portrait;
+ rJobData.m_eOrientation = aLine.copy(RTL_CONSTASCII_LENGTH(orientatationEquals)).equalsIgnoreAsciiCase("landscape") ? orientation::Landscape : orientation::Portrait;
}
- else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(copiesEquals)) == COMPARE_EQUAL )
+ else if (matchL(aLine, RTL_CONSTASCII_STRINGPARAM(copiesEquals)))
{
bCopies = true;
- rJobData.m_nCopies = aLine.Copy(RTL_CONSTASCII_LENGTH(copiesEquals)).ToInt32();
+ rJobData.m_nCopies = aLine.copy(RTL_CONSTASCII_LENGTH(copiesEquals)).toInt32();
}
- else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(margindajustmentEquals)) == COMPARE_EQUAL )
+ else if (matchL(aLine, RTL_CONSTASCII_STRINGPARAM(margindajustmentEquals)))
{
bMargin = true;
- ByteString aValues( aLine.Copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals)) );
- rJobData.m_nLeftMarginAdjust = aValues.GetToken( 0, ',' ).ToInt32();
- rJobData.m_nRightMarginAdjust = aValues.GetToken( 1, ',' ).ToInt32();
- rJobData.m_nTopMarginAdjust = aValues.GetToken( 2, ',' ).ToInt32();
- rJobData.m_nBottomMarginAdjust = aValues.GetToken( 3, ',' ).ToInt32();
+ rtl::OString aValues(aLine.copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals)));
+ using comphelper::string::getToken;
+ rJobData.m_nLeftMarginAdjust = getToken(aValues, 0, ',').toInt32();
+ rJobData.m_nRightMarginAdjust = getToken(aValues, 1, ',').toInt32();
+ rJobData.m_nTopMarginAdjust = getToken(aValues, 2, ',').toInt32();
+ rJobData.m_nBottomMarginAdjust = getToken(aValues, 3, ',').toInt32();
}
- else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(colordepthEquals)) == COMPARE_EQUAL )
+ else if (matchL(aLine, RTL_CONSTASCII_STRINGPARAM(colordepthEquals)))
{
bColorDepth = true;
- rJobData.m_nColorDepth = aLine.Copy(RTL_CONSTASCII_LENGTH(colordepthEquals)).ToInt32();
+ rJobData.m_nColorDepth = aLine.copy(RTL_CONSTASCII_LENGTH(colordepthEquals)).toInt32();
}
- else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(colordeviceEquals)) == COMPARE_EQUAL )
+ else if (matchL(aLine, RTL_CONSTASCII_STRINGPARAM(colordeviceEquals)))
{
bColorDevice = true;
- rJobData.m_nColorDevice = aLine.Copy(RTL_CONSTASCII_LENGTH(colordeviceEquals)).ToInt32();
+ rJobData.m_nColorDevice = aLine.copy(RTL_CONSTASCII_LENGTH(colordeviceEquals)).toInt32();
}
- else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(pslevelEquals)) == COMPARE_EQUAL )
+ else if (matchL(aLine, RTL_CONSTASCII_STRINGPARAM(pslevelEquals)))
{
bPSLevel = true;
- rJobData.m_nPSLevel = aLine.Copy(RTL_CONSTASCII_LENGTH(pslevelEquals)).ToInt32();
+ rJobData.m_nPSLevel = aLine.copy(RTL_CONSTASCII_LENGTH(pslevelEquals)).toInt32();
}
- else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(pdfdeviceEquals)) == COMPARE_EQUAL )
+ else if (matchL(aLine, RTL_CONSTASCII_STRINGPARAM(pdfdeviceEquals)))
{
bPDFDevice = true;
- rJobData.m_nPDFDevice = aLine.Copy(RTL_CONSTASCII_LENGTH(pdfdeviceEquals)).ToInt32();
+ rJobData.m_nPDFDevice = aLine.copy(RTL_CONSTASCII_LENGTH(pdfdeviceEquals)).toInt32();
}
- else if( aLine.Equals( "PPDContexData" ) )
+ else if (aLine.equalsL(RTL_CONSTASCII_STRINGPARAM("PPDContexData")))
{
if( bPrinter )
{
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index 1448211..d04ef42 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -45,7 +45,7 @@
#include "tools/config.hxx"
#include "i18npool/paper.hxx"
-
+#include <comphelper/string.hxx>
#include "rtl/strbuf.hxx"
#include <sal/macros.h>
@@ -273,52 +273,54 @@ void PrinterInfoManager::initialize()
#endif
aConfig.SetGroup( GLOBAL_DEFAULTS_GROUP );
- ByteString aValue( aConfig.ReadKey( "Copies" ) );
- if( aValue.Len() )
- m_aGlobalDefaults.m_nCopies = aValue.ToInt32();
+ rtl::OString aValue( aConfig.ReadKey( "Copies" ) );
+ if (!aValue.isEmpty())
+ m_aGlobalDefaults.m_nCopies = aValue.toInt32();
aValue = aConfig.ReadKey( "Orientation" );
- if( aValue.Len() )
- m_aGlobalDefaults.m_eOrientation = aValue.EqualsIgnoreCaseAscii( "Landscape" ) ? orientation::Landscape : orientation::Portrait;
+ if (!aValue.isEmpty())
+ m_aGlobalDefaults.m_eOrientation = aValue.equalsIgnoreAsciiCase("Landscape") ? orientation::Landscape : orientation::Portrait;
+
+ using comphelper::string::getToken;
aValue = aConfig.ReadKey( "MarginAdjust" );
- if( aValue.Len() )
+ if (!aValue.isEmpty())
{
- m_aGlobalDefaults.m_nLeftMarginAdjust = aValue.GetToken( 0, ',' ).ToInt32();
- m_aGlobalDefaults.m_nRightMarginAdjust = aValue.GetToken( 1, ',' ).ToInt32();
- m_aGlobalDefaults.m_nTopMarginAdjust = aValue.GetToken( 2, ',' ).ToInt32();
- m_aGlobalDefaults.m_nBottomMarginAdjust = aValue.GetToken( 3, ',' ).ToInt32();
+ m_aGlobalDefaults.m_nLeftMarginAdjust = getToken(aValue, 0, ',').toInt32();
+ m_aGlobalDefaults.m_nRightMarginAdjust = getToken(aValue, 1, ',').toInt32();
+ m_aGlobalDefaults.m_nTopMarginAdjust = getToken(aValue, 2, ',').toInt32();
+ m_aGlobalDefaults.m_nBottomMarginAdjust = getToken(aValue, 3, ',').toInt32();
}
aValue = aConfig.ReadKey( "ColorDepth", "24" );
- if( aValue.Len() )
- m_aGlobalDefaults.m_nColorDepth = aValue.ToInt32();
+ if (!aValue.isEmpty())
+ m_aGlobalDefaults.m_nColorDepth = aValue.toInt32();
aValue = aConfig.ReadKey( "ColorDevice" );
- if( aValue.Len() )
- m_aGlobalDefaults.m_nColorDevice = aValue.ToInt32();
+ if (!aValue.isEmpty())
+ m_aGlobalDefaults.m_nColorDevice = aValue.toInt32();
aValue = aConfig.ReadKey( "PSLevel" );
- if( aValue.Len() )
- m_aGlobalDefaults.m_nPSLevel = aValue.ToInt32();
+ if (!aValue.isEmpty())
+ m_aGlobalDefaults.m_nPSLevel = aValue.toInt32();
aValue = aConfig.ReadKey( "PDFDevice" );
- if( aValue.Len() )
- m_aGlobalDefaults.m_nPDFDevice = aValue.ToInt32();
+ if (!aValue.isEmpty())
+ m_aGlobalDefaults.m_nPDFDevice = aValue.toInt32();
aValue = aConfig.ReadKey( "PerformFontSubstitution" );
- if( aValue.Len() )
+ if (!aValue.isEmpty())
{
- if( ! aValue.Equals( "0" ) && ! aValue.EqualsIgnoreCaseAscii( "false" ) )
+ if (!aValue.equals("0") && !aValue.equalsIgnoreAsciiCase("false"))
m_aGlobalDefaults.m_bPerformFontSubstitution = true;
else
m_aGlobalDefaults.m_bPerformFontSubstitution = false;
}
aValue = aConfig.ReadKey( "DisableCUPS" );
- if( aValue.Len() )
+ if (!aValue.isEmpty())
{
- if( aValue.Equals( "1" ) || aValue.EqualsIgnoreCaseAscii( "true" ) )
+ if (aValue.equals("1") || aValue.equalsIgnoreAsciiCase("true"))
m_bDisableCUPS = true;
else
m_bDisableCUPS = false;
@@ -336,7 +338,7 @@ void PrinterInfoManager::initialize()
{
m_aGlobalDefaults.m_aContext.
setValue( pKey,
- aValue.Equals( "*nil" ) ? NULL : pKey->getValue( String( aValue, RTL_TEXTENCODING_ISO_8859_1 ) ),
+ aValue.equals("*nil") ? NULL : pKey->getValue(rtl::OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)),
sal_True );
}
}
@@ -393,14 +395,14 @@ void PrinterInfoManager::initialize()
for( int nGroup = 0; nGroup < aConfig.GetGroupCount(); nGroup++ )
{
aConfig.SetGroup( aConfig.GetGroupName( nGroup ) );
- ByteString aValue = aConfig.ReadKey( "Printer" );
- if( aValue.Len() )
+ rtl::OString aValue = aConfig.ReadKey( "Printer" );
+ if (!aValue.isEmpty())
{
OUString aPrinterName;
- int nNamePos = aValue.Search( '/' );
+ sal_Int32 nNamePos = aValue.indexOf('/');
// check for valid value of "Printer"
- if( nNamePos == STRING_NOTFOUND )
+ if (nNamePos == -1)
continue;
Printer aPrinter;
@@ -412,9 +414,10 @@ void PrinterInfoManager::initialize()
aPrinter.m_aInfo.m_aFontSubstitutes.clear();
aPrinter.m_aInfo.m_aFontSubstitutions.clear();
- aPrinterName = String( aValue.Copy( nNamePos+1 ), RTL_TEXTENCODING_UTF8 );
- aPrinter.m_aInfo.m_aPrinterName = aPrinterName;
- aPrinter.m_aInfo.m_aDriverName = String( aValue.Copy( 0, nNamePos ), RTL_TEXTENCODING_UTF8 );
+ aPrinterName = rtl::OStringToOUString(aValue.copy(nNamePos+1),
+ RTL_TEXTENCODING_UTF8);
+ aPrinter.m_aInfo.m_aPrinterName = aPrinterName;
+ aPrinter.m_aInfo.m_aDriverName = rtl::OStringToOUString(aValue.copy(0, nNamePos), RTL_TEXTENCODING_UTF8);
// set parser, merge settings
// don't do this for CUPS printers as this is done
@@ -456,7 +459,7 @@ void PrinterInfoManager::initialize()
aValue = aConfig.ReadKey( "Command" );
// no printer without a command
- if( ! aValue.Len() )
+ if (aValue.isEmpty())
{
/* TODO:
* porters: please append your platform to the Solaris
@@ -468,61 +471,63 @@ void PrinterInfoManager::initialize()
aValue = "lpr";
#endif
}
- aPrinter.m_aInfo.m_aCommand = String( aValue, RTL_TEXTENCODING_UTF8 );
+ aPrinter.m_aInfo.m_aCommand = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
}
aValue = aConfig.ReadKey( "QuickCommand" );
- aPrinter.m_aInfo.m_aQuickCommand = String( aValue, RTL_TEXTENCODING_UTF8 );
+ aPrinter.m_aInfo.m_aQuickCommand = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
aValue = aConfig.ReadKey( "Features" );
- aPrinter.m_aInfo.m_aFeatures = String( aValue, RTL_TEXTENCODING_UTF8 );
+ aPrinter.m_aInfo.m_aFeatures = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
// override the settings in m_aGlobalDefaults if keys exist
aValue = aConfig.ReadKey( "DefaultPrinter" );
- if( ! aValue.Equals( "0" ) && ! aValue.EqualsIgnoreCaseAscii( "false" ) )
+ if (!aValue.equals("0") && !aValue.equalsIgnoreAsciiCase("false"))
aDefaultPrinter = aPrinterName;
aValue = aConfig.ReadKey( "Location" );
- aPrinter.m_aInfo.m_aLocation = String( aValue, RTL_TEXTENCODING_UTF8 );
+ aPrinter.m_aInfo.m_aLocation = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
aValue = aConfig.ReadKey( "Comment" );
- aPrinter.m_aInfo.m_aComment = String( aValue, RTL_TEXTENCODING_UTF8 );
+ aPrinter.m_aInfo.m_aComment = rtl::OStringToOUString(aValue, RTL_TEXTENCODING_UTF8);
aValue = aConfig.ReadKey( "Copies" );
- if( aValue.Len() )
- aPrinter.m_aInfo.m_nCopies = aValue.ToInt32();
+ if (!aValue.isEmpty())
+ aPrinter.m_aInfo.m_nCopies = aValue.toInt32();
aValue = aConfig.ReadKey( "Orientation" );
- if( aValue.Len() )
- aPrinter.m_aInfo.m_eOrientation = aValue.EqualsIgnoreCaseAscii( "Landscape" ) ? orientation::Landscape : orientation::Portrait;
+ if (!aValue.isEmpty())
+ aPrinter.m_aInfo.m_eOrientation = aValue.equalsIgnoreAsciiCase("Landscape") ? orientation::Landscape : orientation::Portrait;
+
+ using comphelper::string::getToken;
aValue = aConfig.ReadKey( "MarginAdjust" );
- if( aValue.Len() )
+ if (!aValue.isEmpty())
{
- aPrinter.m_aInfo.m_nLeftMarginAdjust = aValue.GetToken( 0, ',' ).ToInt32();
- aPrinter.m_aInfo.m_nRightMarginAdjust = aValue.GetToken( 1, ',' ).ToInt32();
- aPrinter.m_aInfo.m_nTopMarginAdjust = aValue.GetToken( 2, ',' ).ToInt32();
- aPrinter.m_aInfo.m_nBottomMarginAdjust = aValue.GetToken( 3, ',' ).ToInt32();
+ aPrinter.m_aInfo.m_nLeftMarginAdjust = getToken(aValue, 0, ',' ).toInt32();
+ aPrinter.m_aInfo.m_nRightMarginAdjust = getToken(aValue, 1, ',' ).toInt32();
+ aPrinter.m_aInfo.m_nTopMarginAdjust = getToken(aValue, 2, ',' ).toInt32();
+ aPrinter.m_aInfo.m_nBottomMarginAdjust = getToken(aValue, 3, ',' ).toInt32();
}
aValue = aConfig.ReadKey( "ColorDepth" );
- if( aValue.Len() )
- aPrinter.m_aInfo.m_nColorDepth = aValue.ToInt32();
+ if (!aValue.isEmpty())
+ aPrinter.m_aInfo.m_nColorDepth = aValue.toInt32();
aValue = aConfig.ReadKey( "ColorDevice" );
- if( aValue.Len() )
- aPrinter.m_aInfo.m_nColorDevice = aValue.ToInt32();
+ if (!aValue.isEmpty())
+ aPrinter.m_aInfo.m_nColorDevice = aValue.toInt32();
aValue = aConfig.ReadKey( "PSLevel" );
- if( aValue.Len() )
- aPrinter.m_aInfo.m_nPSLevel = aValue.ToInt32();
+ if (!aValue.isEmpty())
+ aPrinter.m_aInfo.m_nPSLevel = aValue.toInt32();
aValue = aConfig.ReadKey( "PDFDevice" );
- if( aValue.Len() )
- aPrinter.m_aInfo.m_nPDFDevice = aValue.ToInt32();
+ if (!aValue.isEmpty())
+ aPrinter.m_aInfo.m_nPDFDevice = aValue.toInt32();
aValue = aConfig.ReadKey( "PerformFontSubstitution" );
- if( ! aValue.Equals( "0" ) && ! aValue.EqualsIgnoreCaseAscii( "false" ) )
+ if (!aValue.equals("0") && !aValue.equalsIgnoreAsciiCase("false"))
aPrinter.m_aInfo.m_bPerformFontSubstitution = true;
else
aPrinter.m_aInfo.m_bPerformFontSubstitution = false;
@@ -541,7 +546,7 @@ void PrinterInfoManager::initialize()
{
aPrinter.m_aInfo.m_aContext.
setValue( pKey,
- aValue.Equals( "*nil" ) ? NULL : pKey->getValue( String( aValue, RTL_TEXTENCODING_ISO_8859_1 ) ),
+ aValue.equals("*nil") ? NULL : pKey->getValue(rtl::OStringToOUString(aValue, RTL_TEXTENCODING_ISO_8859_1)),
sal_True );
}
}
commit bb70a1256200a593489005ce175d57fd246164ad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 09:50:58 2011 +0100
regenerate list
diff --git a/sfx2/inc/sfx2/doctempl.hxx b/sfx2/inc/sfx2/doctempl.hxx
index cfd7e02..df1d9f0 100644
--- a/sfx2/inc/sfx2/doctempl.hxx
+++ b/sfx2/inc/sfx2/doctempl.hxx
@@ -67,7 +67,6 @@ public:
sal_Bool IsConstructed() { return pImp != NULL; }
void Construct();
- static sal_Bool SaveDir( /*SfxTemplateDir &rEntry */ ) ;
const SfxDocumentTemplates &operator=(const SfxDocumentTemplates &);
sal_Bool Rescan( );
@@ -77,20 +76,12 @@ public:
sal_uInt16 GetRegionCount() const;
const String& GetRegionName(sal_uInt16 nIdx) const; //dv!
String GetFullRegionName(sal_uInt16 nIdx) const;
- sal_uInt16 GetRegionNo( const String &rRegionName ) const;
sal_uInt16 GetCount(sal_uInt16 nRegion) const;
- sal_uInt16 GetCount( const String &rName) const;
const String& GetName(sal_uInt16 nRegion, sal_uInt16 nIdx) const; //dv!
String GetFileName(sal_uInt16 nRegion, sal_uInt16 nIdx) const;
String GetPath(sal_uInt16 nRegion, sal_uInt16 nIdx) const;
- String GetDefaultTemplatePath(const String &rLongName);
-
- // Path to the template; the logical name must be given in order to find
- // the correct file name when overwriting a template
- String GetTemplatePath(sal_uInt16 nRegion, const String &rLongName) const;
-
// Allows to retrieve the target template URL from the UCB
::rtl::OUString GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName,
const ::rtl::OUString& aTitle );
@@ -102,11 +93,6 @@ public:
int nCount,
const ::rtl::OUString& rString);
- // Speichern als Vorlage hat geklappt -> Aktualisieren
- void NewTemplate(sal_uInt16 nRegion,
- const String &rLongName,
- const String &rFileName);
-
sal_Bool Copy(sal_uInt16 nTargetRegion,
sal_uInt16 nTargetIdx,
sal_uInt16 nSourceRegion,
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 640c645..a1fb5fc 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -265,10 +265,6 @@ public:
{ return maRegions.size(); }
RegionData_Impl* GetRegion( const OUString& rName ) const;
RegionData_Impl* GetRegion( size_t nIndex ) const;
- void GetTemplates( Content& rTargetFolder,
- Content& rParentFolder,
- RegionData_Impl* pRegion );
-
size_t GetRegionPos( const OUString& rTitle, sal_Bool& rFound ) const;
sal_Bool GetTitleFromURL( const OUString& rURL, OUString& aTitle );
@@ -387,39 +383,6 @@ const String& SfxDocumentTemplates::GetRegionName
return maTmpString;
}
-
-//------------------------------------------------------------------------
-
-sal_uInt16 SfxDocumentTemplates::GetRegionNo
-(
- const String &rRegion // Region Name
-) const
-
-/* [Description]
-
- Returns the Index for a logical Region Name.
-
- [Return value]
-
- sal_uInt16 Index of 'rRegion' or USHRT_MAX if unknown
-
-*/
-{
- DocTemplLocker_Impl aLocker( *pImp );
-
- if ( !pImp->Construct() )
- return USHRT_MAX;
-
- sal_Bool bFound;
- size_t nIndex = pImp->GetRegionPos( rRegion, bFound );
-
- if ( bFound )
- return (sal_uInt16) nIndex;
- else
- return USHRT_MAX;
-}
-
-
//------------------------------------------------------------------------
sal_uInt16 SfxDocumentTemplates::GetRegionCount() const
@@ -464,39 +427,6 @@ sal_Bool SfxDocumentTemplates::IsRegionLoaded( sal_uInt16 nIdx ) const
sal_uInt16 SfxDocumentTemplates::GetCount
(
- const String& rName /* Region Name, for which the entries
- should be counted */
-
-) const
-
-/* [Description]
-
- Number of entries in Region
-
- [Return value]
-
- sal_uInt16 Number of entries
-*/
-
-{
- DocTemplLocker_Impl aLocker( *pImp );
-
- if ( !pImp->Construct() )
- return 0;
-
- RegionData_Impl *pData = pImp->GetRegion( rName );
- sal_uIntPtr nCount = 0;
-
- if ( pData )
- nCount = pData->GetCount();
-
- return (sal_uInt16) nCount;
-}
-
-//------------------------------------------------------------------------
-
-sal_uInt16 SfxDocumentTemplates::GetCount
-(
sal_uInt16 nRegion /* Region index whose number is
to be determined */
@@ -637,114 +567,6 @@ String SfxDocumentTemplates::GetPath
//------------------------------------------------------------------------
-String SfxDocumentTemplates::GetTemplatePath
-(
- sal_uInt16 nRegion, // Region Index, in which the entry lies
- const String& rLongName // logical Entry Name
-) const
-
-/* [Description]
-
- Returns the file name with full path to the file assigned to an entry
-
- [Return value]
-
- String File name with full path
-*/
-{
- DocTemplLocker_Impl aLocker( *pImp );
-
- if ( !pImp->Construct() )
- return String();
-
- DocTempl_EntryData_Impl *pEntry = NULL;
- RegionData_Impl *pRegion = pImp->GetRegion( nRegion );
-
- if ( pRegion )
- pEntry = pRegion->GetEntry( rLongName );
-
- if ( pEntry )
- return pEntry->GetTargetURL();
- else if ( pRegion )
- {
- // a new template is going to be inserted, generate a new URL
- // TODO/LATER: if the title is localized, use minimized URL in future
-
- // --**-- extension handling will become more complicated, because
- // every new document type will have it's own extension
- // e.g.: .stw or .stc instead of .vor
- INetURLObject aURLObj( pRegion->GetTargetURL() );
- aURLObj.insertName( rLongName, false,
- INetURLObject::LAST_SEGMENT, true,
- INetURLObject::ENCODE_ALL );
-
- OUString aExtension = aURLObj.getExtension();
-
- if ( ! aExtension.getLength() )
- aURLObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM( "vor" ) ) );
-
- return aURLObj.GetMainURL( INetURLObject::NO_DECODE );
- }
- else
- return String();
-}
-
-//------------------------------------------------------------------------
-
-String SfxDocumentTemplates::GetDefaultTemplatePath
-(
- const String& rLongName
-)
-
-/* [Description]
-
- Returns the default location for templates
-
- [Return value]
-
- String Default location for templates
-*/
-{
- DocTemplLocker_Impl aLocker( *pImp );
-
- if ( ! pImp->Construct() )
- return String();
-
- // the first region in the list should always be the standard
- // group
- // --**-- perhaps we have to create it ???
- RegionData_Impl *pRegion = pImp->GetRegion( 0L );
- DocTempl_EntryData_Impl *pEntry = NULL;
-
- if ( pRegion )
- pEntry = pRegion->GetEntry( rLongName );
-
- if ( pEntry )
- return pEntry->GetTargetURL();
- else if ( pRegion )
- {
- // a new template is going to be inserted, generate a new URL
- // TODO/LATER: if the title is localized, use minimized URL in future
-
- INetURLObject aURLObj( pRegion->GetTargetURL() );
- aURLObj.insertName( rLongName, false,
- INetURLObject::LAST_SEGMENT, true,
- INetURLObject::ENCODE_ALL );
-
- OUString aExtension = aURLObj.getExtension();
-
- if ( ! aExtension.getLength() )
- aURLObj.setExtension( OUString( RTL_CONSTASCII_USTRINGPARAM( "vor" ) ) );
-
- return aURLObj.GetMainURL( INetURLObject::NO_DECODE );
- }
- else
- return String();
-
-}
-
-//------------------------------------------------------------------------
-
::rtl::OUString SfxDocumentTemplates::GetTemplateTargetURLFromComponent( const ::rtl::OUString& aGroupName,
const ::rtl::OUString& aTitle )
{
@@ -801,69 +623,6 @@ OUString SfxDocumentTemplates::ConvertResourceString (
//------------------------------------------------------------------------
-sal_Bool SfxDocumentTemplates::SaveDir
-(
-// SfxTemplateDir& rDir // Save Directory
-)
-
-/* [Description]
-
- Saves the Directory rDir
-
- [Return value]
-
- sal_Bool sal_False, Write error
- sal_True, Saved
-*/
-
-{
- return sal_True;
-}
-
-//------------------------------------------------------------------------
-
-void SfxDocumentTemplates::NewTemplate
-(
- sal_uInt16 nRegion, /* Region Index, in which the template
- should be applied */
-
- const String& rLongName, // logical name of the new template
- const String& rFileName // File name of the new template
-)
-
-/* [Description]
-
- Submit a new template in the administrative structures
- overwriting a template of the same name is prevented (! Error message)
-*/
-
-{
- DocTemplLocker_Impl aLocker( *pImp );
-
- if ( ! pImp->Construct() )
- return;
-
- DocTempl_EntryData_Impl *pEntry;
- RegionData_Impl *pRegion = pImp->GetRegion( nRegion );
-
- // do nothing if there is no region with that index
- if ( !pRegion )
- return;
-
- pEntry = pRegion->GetEntry( rLongName );
-
- // do nothing if there is already an entry with that name
- if ( pEntry )
- return;
-
- uno::Reference< XDocumentTemplates > xTemplates = pImp->getDocTemplates();
-
- if ( xTemplates->addTemplate( pRegion->GetTitle(), rLongName, rFileName ) )
- pRegion->AddEntry( rLongName, rFileName );
-}
-
-//------------------------------------------------------------------------
-
sal_Bool SfxDocumentTemplates::CopyOrMove
(
sal_uInt16 nTargetRegion, // Target Region Index
@@ -1273,7 +1032,6 @@ sal_Bool SfxDocumentTemplates::Delete
<SfxDocumentTemplates::InsertDir(const String&,sal_uInt16)>
<SfxDocumentTemplates::KillDir(SfxTemplateDir&)>
- <SfxDocumentTemplates::SaveDir(SfxTemplateDir&)>
*/
{
@@ -1336,7 +1094,6 @@ sal_Bool SfxDocumentTemplates::InsertDir
[Cross-references]
<SfxDocumentTemplates::KillDir(SfxTemplateDir&)>
- <SfxDocumentTemplates::SaveDir(SfxTemplateDir&)>
*/
{
DocTemplLocker_Impl aLocker( *pImp );
@@ -2383,65 +2140,6 @@ void SfxDocTemplate_Impl::ReInitFromComponent()
}
// -----------------------------------------------------------------------
-void SfxDocTemplate_Impl::GetTemplates( Content& rTargetFolder,
- Content& /*rParentFolder*/,
- RegionData_Impl* pRegion )
-{
- uno::Reference< XResultSet > xResultSet;
- Sequence< OUString > aProps(1);
-
- aProps[0] = OUString(RTL_CONSTASCII_USTRINGPARAM( TITLE ));
-
- try
- {
- ResultSetInclude eInclude = INCLUDE_DOCUMENTS_ONLY;
- Sequence< NumberedSortingInfo > aSortingInfo(1);
- aSortingInfo.getArray()->ColumnIndex = 1;
- aSortingInfo.getArray()->Ascending = sal_True;
- xResultSet = rTargetFolder.createSortedCursor( aProps, aSortingInfo, m_rCompareFactory, eInclude );
- }
- catch ( Exception& ) {}
-
- if ( xResultSet.is() )
- {
- uno::Reference< XContentAccess > xContentAccess( xResultSet, UNO_QUERY );
- uno::Reference< XRow > xRow( xResultSet, UNO_QUERY );
-
- try
- {
- while ( xResultSet->next() )
- {
- OUString aTitle( xRow->getString(1) );
-
- if ( aTitle.compareToAscii( "sfx.tlx" ) == 0 )
- continue;
-
- OUString aId = xContentAccess->queryContentIdentifierString();
-
- DocTempl_EntryData_Impl* pEntry = pRegion->GetByTargetURL( aId );
-
- if ( ! pEntry )
- {
- OUString aFullTitle;
- if( !GetTitleFromURL( aId, aFullTitle ) )
- {
- DBG_ERRORFILE( "GetTemplates(): template of alien format" );
- continue;
- }
-
- if ( aFullTitle.getLength() )
- aTitle = aFullTitle;
-
- pRegion->AddEntry( aTitle, aId );
- }
- }
- }
- catch ( Exception& ) {}
- }
-}
-
-
-// -----------------------------------------------------------------------
size_t SfxDocTemplate_Impl::GetRegionPos( const OUString& rTitle, sal_Bool& rFound ) const
{
int nCompVal = 1;
diff --git a/unusedcode.easy b/unusedcode.easy
index 7aead6e..091f61a 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -924,11 +924,7 @@ SfxDispatcher::GetSlotId(String const&)
SfxDispatcher::HasSlot_Impl(unsigned short)
SfxDispatcher::SetModalMode_Impl(unsigned char)
SfxDispatcher::_Execute(SfxSlotServer const&)
-SfxDocTemplate_Impl::GetTemplates(ucbhelper::Content&, ucbhelper::Content&, RegionData_Impl*)
SfxDockingWrapper::GetChildWindowId()
-SfxDocumentTemplates::GetCount(String const&) const
-SfxDocumentTemplates::GetRegionNo(String const&) const
-SfxDocumentTemplates::SaveDir()
SfxEnumMenu::SfxEnumMenu(unsigned short, SfxBindings*, SfxEnumItem const&)
SfxExecuteItem::SfxExecuteItem(unsigned short, unsigned short, unsigned short)
SfxExecuteItem::SfxExecuteItem(unsigned short, unsigned short, unsigned short, SfxPoolItem const*, ...)
@@ -2266,6 +2262,7 @@ binfilter::ScMultipleWriteHeader::~ScMultipleWriteHeader()
binfilter::ScMyContentAction::~ScMyContentAction()
binfilter::ScMyDelAction::~ScMyDelAction()
binfilter::ScMyMoveAction::~ScMyMoveAction()
+binfilter::ScMySharedData::~ScMySharedData()
binfilter::ScRangeFindList::~ScRangeFindList()
binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const&, unsigned short&)
binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationData* const*, unsigned short)
@@ -2280,6 +2277,7 @@ binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const&, unsi
binfilter::ScriptTypePosInfos::Replace(binfilter::ScriptTypePosInfo const*, unsigned short, unsigned short)
binfilter::ScriptTypePosInfos::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::ScriptTypePosInfo const&, void*), void*)
binfilter::SdXMLFilter::SdXMLFilter(binfilter::SfxMedium&, binfilter::SdDrawDocShell&, unsigned char, binfilter::SdXMLFilterMode)
+binfilter::SdrMarkList::InsertEntry(binfilter::SdrMark const&, bool)
binfilter::SdrUnoControlAccessArr::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&, unsigned short&)
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const*, unsigned short)
@@ -2291,7 +2289,6 @@ binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const&, u
binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const*, unsigned short, unsigned short)
binfilter::SfxItemModifyArr_Impl::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SfxItemModifyImpl const&, void*), void*)
binfilter::SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(unsigned char, SvStream*, unsigned short, unsigned char)
-binfilter::SfxPSPropertyArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SfxPtrArr::Insert(unsigned short, void*)
binfilter::SfxPtrArr::Remove(void*)
binfilter::SfxPtrArr::Replace(void*, void*)
commit 8a0941ad1d85994d8ddf313dfe17af03906fd930
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 00:50:26 2011 +0100
use RTL_CONSTASCII_LENGTH/SAL_N_ELEMENTS
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index bcf44d3..e49253a 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -376,7 +376,7 @@ void BackendImpl::configmgrini_verify_init(
if (readLine( &line, OUSTR("SCHEMA="), ucb_content,
RTL_TEXTENCODING_UTF8 ))
{
- sal_Int32 index = sizeof ("SCHEMA=") - 1;
+ sal_Int32 index = RTL_CONSTASCII_LENGTH("SCHEMA=");
do {
OUString token( line.getToken( 0, ' ', index ).trim() );
if (token.getLength() > 0) {
@@ -391,7 +391,7 @@ void BackendImpl::configmgrini_verify_init(
}
if (readLine( &line, OUSTR("DATA="), ucb_content,
RTL_TEXTENCODING_UTF8 )) {
- sal_Int32 index = sizeof ("DATA=") - 1;
+ sal_Int32 index = RTL_CONSTASCII_LENGTH("DATA=");
do {
OUString token( line.getToken( 0, ' ', index ).trim() );
if (token.getLength() > 0)
@@ -639,7 +639,7 @@ OUString replaceOrigin(
else if (rtl_str_shortenedCompare_WithLength(
pBytes, nBytes,
RTL_CONSTASCII_STRINGPARAM("origin%"),
- sizeof ("origin%") - 1 ) == 0)
+ RTL_CONSTASCII_LENGTH("origin%")) == 0)
{
if (origin.getLength() == 0) {
// encode only once
@@ -650,8 +650,8 @@ OUString replaceOrigin(
}
pAdd = origin.getStr();
nAdd = origin.getLength();
- pBytes += (sizeof ("origin%") - 1);
- nBytes -= (sizeof ("origin%") - 1);
+ pBytes += SAL_N_ELEMENTS("origin%");
+ nBytes -= SAL_N_ELEMENTS("origin%");
use_filtered = true;
}
if ((write_pos + nAdd) > filtered.getLength())
commit ab8feacc507e94bf29f19b3b6790806a2cccee2f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 17 00:37:21 2011 +0100
ByteString->rtl::OString
diff --git a/svtools/source/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx
index 73e89d7..3ea92f7 100644
--- a/svtools/source/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter/FilterConfigCache.cxx
@@ -323,8 +323,8 @@ void FilterConfigCache::ImplInitSmart()
aEntry.sType = sExtension;
aEntry.sUIName = sExtension;
- ByteString sFlags( *pPtr++ );
- aEntry.nFlags = sFlags.ToInt32();
+ rtl::OString sFlags( *pPtr++ );
+ aEntry.nFlags = sFlags.toInt32();
OUString sUserData( OUString::createFromAscii( *pPtr ) );
aEntry.CreateFilterName( sUserData );
commit f7cb4edec2786421df8813b3ed29b04b22fbc9e1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 16 23:38:10 2011 +0100
calculate lengths at compile time
diff --git a/vcl/unx/generic/printer/jobdata.cxx b/vcl/unx/generic/printer/jobdata.cxx
index 872e880..7f27d85 100644
--- a/vcl/unx/generic/printer/jobdata.cxx
+++ b/vcl/unx/generic/printer/jobdata.cxx
@@ -198,54 +198,64 @@ bool JobData::constructFromStreamBuffer( void* pData, int bytes, JobData& rJobDa
bool bColorDevice = false;
bool bPSLevel = false;
bool bPDFDevice = false;
+
+ const char printerEquals[] = "printer=";
+ const char orientatationEquals[] = "orientation=";
+ const char copiesEquals[] = "copies=";
+ const char margindajustmentEquals[] = "margindajustment=";
+ const char colordepthEquals[] = "colordepth=";
+ const char colordeviceEquals[] = "colordevice=";
+ const char pslevelEquals[] = "pslevel=";
+ const char pdfdeviceEquals[] = "pdfdevice=";
+
while( ! aStream.IsEof() )
{
aStream.ReadLine( aLine );
- if( aLine.CompareTo( "JobData", 7 ) == COMPARE_EQUAL )
+ if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM("JobData")) == COMPARE_EQUAL )
bVersion = true;
- else if( aLine.CompareTo( "printer=", 8 ) == COMPARE_EQUAL )
+ else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(printerEquals)) == COMPARE_EQUAL )
{
bPrinter = true;
- rJobData.m_aPrinterName = String( aLine.Copy( 8 ), RTL_TEXTENCODING_UTF8 );
+ rJobData.m_aPrinterName = String( aLine.Copy(RTL_CONSTASCII_LENGTH(printerEquals)), RTL_TEXTENCODING_UTF8 );
}
- else if( aLine.CompareTo( "orientation=", 12 ) == COMPARE_EQUAL )
+ else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(orientatationEquals)) == COMPARE_EQUAL )
{
bOrientation = true;
- rJobData.m_eOrientation = aLine.Copy( 12 ).EqualsIgnoreCaseAscii( "landscape" ) ? orientation::Landscape : orientation::Portrait;
+ rJobData.m_eOrientation = aLine.Copy(RTL_CONSTASCII_LENGTH(orientatationEquals)).EqualsIgnoreCaseAscii( "landscape" ) ? orientation::Landscape : orientation::Portrait;
}
- else if( aLine.CompareTo( "copies=", 7 ) == COMPARE_EQUAL )
+ else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(copiesEquals)) == COMPARE_EQUAL )
{
bCopies = true;
- rJobData.m_nCopies = aLine.Copy( 7 ).ToInt32();
+ rJobData.m_nCopies = aLine.Copy(RTL_CONSTASCII_LENGTH(copiesEquals)).ToInt32();
}
- else if( aLine.CompareTo( "margindajustment=",17 ) == COMPARE_EQUAL )
+ else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(margindajustmentEquals)) == COMPARE_EQUAL )
{
bMargin = true;
- ByteString aValues( aLine.Copy( 17 ) );
+ ByteString aValues( aLine.Copy(RTL_CONSTASCII_LENGTH(margindajustmentEquals)) );
rJobData.m_nLeftMarginAdjust = aValues.GetToken( 0, ',' ).ToInt32();
rJobData.m_nRightMarginAdjust = aValues.GetToken( 1, ',' ).ToInt32();
rJobData.m_nTopMarginAdjust = aValues.GetToken( 2, ',' ).ToInt32();
rJobData.m_nBottomMarginAdjust = aValues.GetToken( 3, ',' ).ToInt32();
}
- else if( aLine.CompareTo( "colordepth=", 11 ) == COMPARE_EQUAL )
+ else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(colordepthEquals)) == COMPARE_EQUAL )
{
bColorDepth = true;
- rJobData.m_nColorDepth = aLine.Copy( 11 ).ToInt32();
+ rJobData.m_nColorDepth = aLine.Copy(RTL_CONSTASCII_LENGTH(colordepthEquals)).ToInt32();
}
- else if( aLine.CompareTo( "colordevice=", 12 ) == COMPARE_EQUAL )
+ else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(colordeviceEquals)) == COMPARE_EQUAL )
{
bColorDevice = true;
- rJobData.m_nColorDevice = aLine.Copy( 12 ).ToInt32();
+ rJobData.m_nColorDevice = aLine.Copy(RTL_CONSTASCII_LENGTH(colordeviceEquals)).ToInt32();
}
- else if( aLine.CompareTo( "pslevel=", 8 ) == COMPARE_EQUAL )
+ else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(pslevelEquals)) == COMPARE_EQUAL )
{
bPSLevel = true;
- rJobData.m_nPSLevel = aLine.Copy( 8 ).ToInt32();
+ rJobData.m_nPSLevel = aLine.Copy(RTL_CONSTASCII_LENGTH(pslevelEquals)).ToInt32();
}
- else if( aLine.CompareTo( "pdfdevice=", 10 ) == COMPARE_EQUAL )
+ else if( aLine.CompareTo(RTL_CONSTASCII_STRINGPARAM(pdfdeviceEquals)) == COMPARE_EQUAL )
{
bPDFDevice = true;
- rJobData.m_nPDFDevice = aLine.Copy( 10 ).ToInt32();
+ rJobData.m_nPDFDevice = aLine.Copy(RTL_CONSTASCII_LENGTH(pdfdeviceEquals)).ToInt32();
}
else if( aLine.Equals( "PPDContexData" ) )
{
commit 7acd9e2c28911003511de641cfd18b86bde7d808
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 16 23:06:13 2011 +0100
callcatcher: remove some methods
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 9bbad2f..2bb90d7 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/lotuswordpro/source/filter/lwplayout.cxx
@@ -944,13 +944,6 @@ sal_uInt16 LwpMiddleLayout::GetScaleMode(void)
return (LwpLayoutScale::FIT_IN_FRAME | LwpLayoutScale::MAINTAIN_ASPECT_RATIO);
}
-void LwpMiddleLayout::SetScaleMode(sal_uInt16 nVal)
-{
- m_nOverrideFlag |= OVER_SCALING;
-// nVal |= LwpLayoutScale::MAINTAIN_ASPECT_RATIO;
- GetLayoutScale()->SetScaleMode(nVal);
-}
-
sal_uInt16 LwpMiddleLayout::GetScaleTile(void)
{
if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj())
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index abe582d..39f82e9 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -305,7 +305,6 @@ public:
LwpLayoutScale* GetLayoutScale(){return dynamic_cast<LwpLayoutScale*>(m_LayScale.obj());}
sal_uInt16 GetScaleMode(void);
- void SetScaleMode(sal_uInt16 nVal);
sal_uInt16 GetScaleTile(void);
void SetScaleTile(sal_uInt16 nVal);
sal_uInt16 GetScaleCenter(void);
diff --git a/lotuswordpro/source/filter/lwplaypiece.hxx b/lotuswordpro/source/filter/lwplaypiece.hxx
index ea1e386..74a2247 100644
--- a/lotuswordpro/source/filter/lwplaypiece.hxx
+++ b/lotuswordpro/source/filter/lwplaypiece.hxx
@@ -113,7 +113,6 @@ public:
virtual ~LwpLayoutScale();
virtual void Parse(IXFStream* pOutputStream);
sal_uInt16 GetScaleMode(){return m_nScaleMode;}
- void SetScaleMode(sal_uInt16 nVal){m_nScaleMode = nVal;}
sal_uInt32 GetScalePercentage(){return m_nScalePercentage;}
void SetScalePercentage(sal_uInt32 nVal){m_nScalePercentage = nVal;}
sal_Int32 GetScaleWidth(){return m_nScaleWidth;}
diff --git a/lotuswordpro/source/filter/lwpobjid.cxx b/lotuswordpro/source/filter/lwpobjid.cxx
index a0c6605..7826866 100644
--- a/lotuswordpro/source/filter/lwpobjid.cxx
+++ b/lotuswordpro/source/filter/lwpobjid.cxx
@@ -156,29 +156,6 @@ sal_uInt32 LwpObjectID::ReadIndexed(LwpObjectStream *pStrm)
return DiskSizeIndexed();
}
/**
- * @descr Read object id with compressed format from stream
- * if diff == 255: 255+lowid+highid
- * else lowid equals to the lowid of previous low id
- * and high id = the high id of previous id + diff +1
-*/
-sal_uInt32 LwpObjectID::ReadCompressed( LwpSvStream* pStrm, LwpObjectID &prev )
-{
- sal_uInt32 len=0;
- sal_uInt8 diff;
-
- len = pStrm->Read( &diff, sizeof(diff));
- if (diff == 255)
- {
- len += Read(pStrm);
- }
- else
- {
- m_nLow = prev.GetLow();
- m_nHigh = prev.GetHigh() + diff +1;
- }
- return len;
-}
-/**
* @descr Read object id with compressed format from object stream
* if diff == 255: 255+lowid+highid
* else lowid equals to the lowid of previous low id
@@ -237,18 +214,5 @@ LwpObject* LwpObjectID::obj(VO_TYPE tag) const
}
return(pObj);
}
-/**
- * @descr returns a buffer that contains the highid + lowid
- */
-sal_Char* LwpObjectID::GetBuffer(sal_Char *buf)
-{
- buf[0] = m_nHigh && 0xFF00;
- buf[1] = m_nHigh && 0x00FF;
- buf[2] = m_nLow && 0xFF000000;
- buf[3] = m_nLow && 0x00FF0000;
- buf[4] = m_nLow && 0x0000FF00;
- buf[5] = m_nLow && 0x000000FF;
- return buf;
-}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/lwpobjid.hxx b/lotuswordpro/source/filter/lwpobjid.hxx
index 284e4a7..0c54a2b 100644
--- a/lotuswordpro/source/filter/lwpobjid.hxx
+++ b/lotuswordpro/source/filter/lwpobjid.hxx
@@ -88,7 +88,6 @@ public:
sal_uInt32 Read( LwpObjectStream *pStrm );
sal_uInt32 ReadIndexed( LwpSvStream* pStrm );
sal_uInt32 ReadIndexed( LwpObjectStream *pStrm );
- sal_uInt32 ReadCompressed( LwpSvStream* pStrm, LwpObjectID &prev );
sal_uInt32 ReadCompressed( LwpObjectStream* pObj, LwpObjectID& prev );
sal_uInt32 DiskSize() const;
@@ -103,7 +102,6 @@ public:
sal_Bool operator == (const LwpObjectID &Other) const;
sal_Bool operator != (const LwpObjectID &Other) const;
- sal_Char* GetBuffer(sal_Char* buf);
LwpObject* obj(VO_TYPE tag=VO_INVALID) const;
size_t HashCode() const;
};
diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx
index d6c6fc8..c7a3177 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.cxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.cxx
@@ -258,17 +258,6 @@ sal_Int16 LwpObjectStream::QuickReadInt16(bool *pFailure)
return static_cast<sal_Int16>(SVBT16ToShort(aValue));
}
/**
- * @descr Quick read sal_Int8
- */
-sal_Int8 LwpObjectStream::QuickReadInt8(bool *pFailure)
-{
- SVBT8 aValue = {0};
- sal_uInt16 nRead = QuickRead(aValue, sizeof(aValue));
- if (pFailure)
- *pFailure = (nRead != sizeof(aValue));
- return static_cast<sal_Int8>(SVBT8ToByte(aValue));
-}
-/**
* @descr Quick read sal_uInt8
*/
sal_uInt8 LwpObjectStream::QuickReaduInt8(bool *pFailure)
diff --git a/lotuswordpro/source/filter/lwpobjstrm.hxx b/lotuswordpro/source/filter/lwpobjstrm.hxx
index 3c77bff..60f2ce3 100644
--- a/lotuswordpro/source/filter/lwpobjstrm.hxx
+++ b/lotuswordpro/source/filter/lwpobjstrm.hxx
@@ -102,7 +102,6 @@ public:
sal_uInt8 QuickReaduInt8(bool *pFailure=NULL);
sal_Int32 QuickReadInt32(bool *pFailure=NULL);
sal_Int16 QuickReadInt16(bool *pFailure=NULL);
- sal_Int8 QuickReadInt8(bool *pFailure=NULL);
double QuickReadDouble(bool *pFailure=NULL);
OUString QuickReadStringPtr();
diff --git a/sfx2/inc/resmgr.hxx b/sfx2/inc/resmgr.hxx
index 3e0fc3c..09bdca5 100644
--- a/sfx2/inc/resmgr.hxx
+++ b/sfx2/inc/resmgr.hxx
@@ -69,9 +69,6 @@ public:
SfxMessageDescription* CreateDescription( sal_uInt16 nId );
};
-
-#define SFX_RESMANAGER() SFX_APP()->GetResourceManager()
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/inc/sfx2/app.hxx b/sfx2/inc/sfx2/app.hxx
index 060af28..ca78c56 100644
--- a/sfx2/inc/sfx2/app.hxx
+++ b/sfx2/inc/sfx2/app.hxx
@@ -162,7 +162,6 @@ public:
static SfxApplication* GetOrCreate();
// Resource Manager
- SfxResourceManager& GetResourceManager() const;
ResMgr* GetSfxResManager();
static ResMgr* CreateResManager( const char *pPrefix );
@@ -182,7 +181,6 @@ public:
// "static" methods
sal_uIntPtr LoadTemplate( SfxObjectShellLock& xDoc, const String& rFileName, sal_Bool bCopy=sal_True, SfxItemSet* pArgs = 0 );
- ::com::sun::star::uno::Reference< ::com::sun::star::task::XStatusIndicator > GetStatusIndicator() const;
SfxTemplateDialog* GetTemplateDialog();
Window* GetTopWindow() const;
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index af6ba04..dba159d 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -145,7 +145,6 @@ public:
void SetReferer( const String& rRefer );
const String& GetReferer( ) const;
- sal_Bool Exists( sal_Bool bForceSession = sal_True );
void SetFilter(const SfxFilter *pFlt, sal_Bool bResetOrig = sal_False);
const SfxFilter * GetFilter() const { return pFilter; }
const SfxFilter * GetOrigFilter( sal_Bool bNotCurrent = sal_False ) const;
@@ -167,7 +166,6 @@ public:
const String& GetPhysicalName() const;
sal_Bool IsRemote();
sal_Bool IsOpen() const; // { return aStorage.Is() || pInStream; }
- void StartDownload();
void DownLoad( const Link& aLink = Link());
void SetDoneLink( const Link& rLink );
Link GetDoneLink( ) const;
diff --git a/sfx2/inc/sfx2/doctdlg.hxx b/sfx2/inc/sfx2/doctdlg.hxx
index 8d8e7df..9d3261b 100644
--- a/sfx2/inc/sfx2/doctdlg.hxx
+++ b/sfx2/inc/sfx2/doctdlg.hxx
@@ -75,8 +75,6 @@ public:
String GetTemplateName() const
{ return aNameEd.GetText().EraseLeadingChars(); }
- String GetTemplatePath();
- void NewTemplate(const String &rPath);
sal_uInt16 GetRegion() const { return aRegionLb.GetSelectEntryPos(); }
String GetRegionName() const { return aRegionLb.GetSelectEntry(); }
};
diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index a4b990c..5d39f17 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -79,7 +79,6 @@ public:
static SfxMenuControl* CreateControl( sal_uInt16 nId, Menu &, SfxBindings & );
static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, SfxBindings&, SfxVirtualMenu* );
static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* );
- static sal_Bool IsSpecialControl( sal_uInt16 nId, SfxModule* );
static void RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*);
};
diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx
index 49ff8fa..c95b31b 100644
--- a/sfx2/inc/sfx2/mnumgr.hxx
+++ b/sfx2/inc/sfx2/mnumgr.hxx
@@ -75,8 +75,6 @@ protected:
sal_uInt32 GetType() { return nType; }
public:
- void UseDefault();
-
DECL_LINK( Select, Menu* );
SfxVirtualMenu* GetMenu() const
@@ -87,8 +85,6 @@ public:
void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; }
ResMgr* GetResMgr() const { return pResMgr; }
void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu );
-
- void Construct_Impl( Menu* pMenu, sal_Bool bWithHelp );
};
//--------------------------------------------------------------------
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 1c552ca..ed3695c 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -583,20 +583,6 @@ Window* SfxApplication::GetTopWindow() const
return pWork ? pWork->GetWindow() : NULL;
}
-//--------------------------------------------------------------------
-
-uno::Reference< task::XStatusIndicator > SfxApplication::GetStatusIndicator() const
-{
- if ( !pAppData_Impl->pViewFrame )
- return uno::Reference< task::XStatusIndicator >();
-
- SfxViewFrame *pTop = pAppData_Impl->pViewFrame;
- while ( pTop->GetParentViewFrame_Impl() )
- pTop = pTop->GetParentViewFrame_Impl();
-
- return pTop->GetFrame().GetWorkWindow_Impl()->GetStatusIndicator();
-}
-
SfxTbxCtrlFactArr_Impl& SfxApplication::GetTbxCtrlFactories_Impl() const
{
return *pAppData_Impl->pTbxCtrlFac;
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 767e514..fffecd3 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -276,7 +276,6 @@ ISfxTemplateCommon* SfxApplication::GetCurrentTemplateCommon( SfxBindings& rBind
return 0;
}
-SfxResourceManager& SfxApplication::GetResourceManager() const { return *pAppData_Impl->pResMgr; }
sal_Bool SfxApplication::IsDowning() const { return pAppData_Impl->bDowning; }
SfxDispatcher* SfxApplication::GetAppDispatcher_Impl() { return pAppData_Impl->pAppDispat; }
SfxSlotPool& SfxApplication::GetAppSlotPool_Impl() const { return *pAppData_Impl->pSlotPool; }
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 5f925b0..184768e 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2380,12 +2380,6 @@ void SfxMedium::SetDataAvailableLink( const Link& rLink )
pImp->aAvailableLink = rLink;
}
-//----------------------------------------------------------------
-void SfxMedium::StartDownload()
-{
- GetInStream();
-}
-
void SfxMedium::DownLoad( const Link& aLink )
{
SetDoneLink( aLink );
@@ -2774,14 +2768,6 @@ void SfxMedium::SetPhysicalName_Impl( const String& rNameP )
//------------------------------------------------------------------
-sal_Bool SfxMedium::Exists( sal_Bool /*bForceSession*/ )
-{
- OSL_FAIL( "Not implemented!" );
- return sal_True;
-}
-
-//------------------------------------------------------------------
-
void SfxMedium::ReOpen()
{
sal_Bool bUseInteractionHandler = pImp->bUseInteractionHandler;
diff --git a/sfx2/source/doc/doctdlg.cxx b/sfx2/source/doc/doctdlg.cxx
index 222cfaf..360b1fe 100644
--- a/sfx2/source/doc/doctdlg.cxx
+++ b/sfx2/source/doc/doctdlg.cxx
@@ -214,23 +214,4 @@ IMPL_LINK( SfxDocumentTemplateDlg, NameModify, Edit *, pBox )
return 0;
}
-//-------------------------------------------------------------------------
-
-String SfxDocumentTemplateDlg::GetTemplatePath()
-{
- const String& rPath=GetTemplateName();
- if(pTemplates->GetRegionCount())
- return pTemplates->GetTemplatePath(
- aRegionLb.GetSelectEntryPos(), rPath);
- return pTemplates->GetDefaultTemplatePath(rPath);
-}
-
-//-------------------------------------------------------------------------
-
-void SfxDocumentTemplateDlg::NewTemplate(const String &rPath)
-{
- pTemplates->NewTemplate(
- aRegionLb.GetSelectEntryPos(), GetTemplateName(), rPath);
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index b346258..62e88fe 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -373,36 +373,6 @@ SfxMenuControl* SfxMenuControl::CreateControl( sal_uInt16 nId, Menu &rMenu, SfxB
return 0;
}
-sal_Bool SfxMenuControl::IsSpecialControl( sal_uInt16 nId, SfxModule* pMod )
-{
- TypeId aSlotType = SFX_SLOTPOOL().GetSlotType( nId );
- if ( aSlotType )
- {
- if ( pMod )
- {
- SfxMenuCtrlFactArr_Impl *pFactories = pMod->GetMenuCtrlFactories_Impl();
- if ( pFactories )
- {
- SfxMenuCtrlFactArr_Impl &rFactories = *pFactories;
- for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
- if ( rFactories[nFactory]->nTypeId == aSlotType &&
- ( ( rFactories[nFactory]->nSlotId == 0 ) ||
- ( rFactories[nFactory]->nSlotId == nId) ) )
- return sal_True;
- }
- }
-
- SfxMenuCtrlFactArr_Impl &rFactories = SFX_APP()->GetMenuCtrlFactories_Impl();
-
- for ( sal_uInt16 nFactory = 0; nFactory < rFactories.Count(); ++nFactory )
- if ( rFactories[nFactory]->nTypeId == aSlotType &&
- ( ( rFactories[nFactory]->nSlotId == 0 ) ||
- ( rFactories[nFactory]->nSlotId == nId) ) )
- return sal_True;
- }
- return 0;
-}
-
//--------------------------------------------------------------------
PopupMenu* SfxMenuControl::GetPopup () const
diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 793c122..d8e01e4 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -265,61 +265,6 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu )
return pThesSubMenu;
}
-
-//--------------------------------------------------------------------
-
-void SfxMenuManager::UseDefault()
-{
- DBG_MEMTEST();
-
- SFX_APP();
- SfxVirtualMenu *pOldVirtMenu=0;
- if (pMenu)
- {
- pOldVirtMenu = pMenu;
- pBindings->ENTERREGISTRATIONS();
- }
-
- SfxVirtualMenu *pVMenu = 0;
- {
- ResId aResId(GetType(),*pResMgr);
- aResId.SetRT(RSC_MENU);
- Menu *pSVMenu = new PopupMenu( aResId );
-
- if ( bAddClipboardFuncs )
- {
- sal_uInt16 n, nCount = pSVMenu->GetItemCount();
- for ( n=0; n<nCount; n++ )
- {
- sal_uInt16 nId = pSVMenu->GetItemId( n );
- if ( nId == SID_COPY || nId == SID_CUT || nId == SID_PASTE )
- break;
- }
-
- if ( n == nCount )
- {
- PopupMenu aPop( SfxResId( MN_CLIPBOARDFUNCS ) );
- nCount = aPop.GetItemCount();
- pSVMenu->InsertSeparator();
- for ( n=0; n<nCount; n++ )
- {
- sal_uInt16 nId = aPop.GetItemId( n );
- pSVMenu->InsertItem( nId, aPop.GetItemText( nId ), aPop.GetItemBits( nId ) );
- }
- }
- }
-
- pVMenu = new SfxVirtualMenu( pSVMenu, sal_False, *pBindings, sal_True, sal_True );
- }
-
- Construct(*pVMenu);
- if (pOldVirtMenu)
- {
- delete pOldVirtMenu;
- pBindings->LEAVEREGISTRATIONS();
- }
-}
-
// ------------------------------------------------------------------------
// executes the function for the selected item
@@ -355,29 +300,6 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
//--------------------------------------------------------------------
-void SfxMenuManager::Construct_Impl( Menu* pSVMenu, sal_Bool bWithHelp )
-{
- SfxVirtualMenu *pOldVirtMenu=0;
- if ( pMenu )
- {
- // It is reconfigured
- pOldVirtMenu = pMenu;
- pBindings->ENTERREGISTRATIONS();
- }
-
- TryToHideDisabledEntries_Impl( pSVMenu );
- SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, sal_True );
- Construct(*pVMenu);
-
- if ( pOldVirtMenu )
- {
- delete pOldVirtMenu;
- pBindings->LEAVEREGISTRATIONS();
- }
-}
-
-//--------------------------------------------------------------------
-
// don't insert Popups into ConfigManager, they are not configurable at the moment !
SfxPopupMenuManager::SfxPopupMenuManager(const ResId& rResId, SfxBindings &rBindings )
: SfxMenuManager( rResId, rBindings )
diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index bfde32a..efbbc21 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.cxx
@@ -318,19 +318,6 @@ void StgEntry::SetLeaf( StgEntryRef eRef, sal_Int32 nPage )
}
}
-const sal_Int32* StgEntry::GetTime( StgEntryTime eTime ) const
-{
- return( eTime == STG_MODIFIED ) ? nMtime : nAtime;
-}
-
-void StgEntry::SetTime( StgEntryTime eTime, sal_Int32* pTime )
-{
- if( eTime == STG_MODIFIED )
- nMtime[ 0 ] = *pTime++, nMtime[ 1 ] = *pTime;
- else
- nAtime[ 0 ] = *pTime++, nAtime[ 1 ] = *pTime;
-}
-
void StgEntry::SetClassId( const ClsId& r )
{
memcpy( &aClsId, &r, sizeof( ClsId ) );
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index 7ef8c47..e4e839c 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.hxx
@@ -152,8 +152,6 @@ public:
void SetClassId( const ClsId& );
sal_Int32 GetLeaf( StgEntryRef ) const;
void SetLeaf( StgEntryRef, sal_Int32 );
- const sal_Int32* GetTime( StgEntryTime ) const;
- void SetTime( StgEntryTime, sal_Int32* );
};
diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx
index 2f80f02..5c3a8dd 100644
--- a/svl/inc/svl/filerec.hxx
+++ b/svl/inc/svl/filerec.hxx
@@ -342,14 +342,6 @@ class SVL_DLLPUBLIC SfxSingleRecordWriter: public SfxMiniRecordWriter
1* sal_uInt8 Content-Version
1* sal_uInt16 Content-Tag
SizeOfContent* sal_uInt8 Content
-
- [Beispiel]
-
- {
- SfxSingleRecordWriter aRecord( pStream, MY_TAG_X, MY_VERSION );
- *aRecord << aMember1;
- *aRecord << aMember2;
- }
*/
{
@@ -359,9 +351,6 @@ protected:
sal_uInt16 nTag, sal_uInt8 nCurVer );
public:
- SfxSingleRecordWriter( SvStream *pStream,
- sal_uInt16 nTag, sal_uInt8 nCurVer );
-
inline void Reset();
sal_uInt32 Close( bool bSeekToEndOfRec = true );
@@ -379,22 +368,6 @@ class SVL_DLLPUBLIC SfxSingleRecordReader: public SfxMiniRecordReader
Es ist auch m"oglich, den Record zu "uberspringen, ohne sein internes
Format zu kennen.
-
- [Beispiel]
-
- {
- SfxSingleRecordReader aRecord( pStream );
- switch ( aRecord.GetTag() )
- {
- case MY_TAG_X:
- aRecord >> aMember1;
- if ( aRecord.HasVersion(2) )
- *aRecord >> aMember2;
- break;
-
- ...
- }
- }
*/
{
@@ -414,7 +387,6 @@ protected:
bool ReadHeader_Impl( sal_uInt16 nTypes );
public:
- SfxSingleRecordReader( SvStream *pStream, sal_uInt16 nTag );
inline sal_uInt16 GetTag() const;
diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index 2984909..2fc9dd4 100644
--- a/svl/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.cxx
@@ -263,28 +263,6 @@ SfxSingleRecordWriter::SfxSingleRecordWriter
*pStream << SFX_REC_HEADER(nRecordType, nContentTag, nContentVer);
}
-//-------------------------------------------------------------------------
-
-SfxSingleRecordWriter::SfxSingleRecordWriter
-(
- SvStream* pStream, // Stream, in dem der Record angelegt wird
- sal_uInt16 nContentTag, // Inhalts-Art-Kennung
- sal_uInt8 nContentVer // Inhalts-Versions-Kennung
-)
-
-/* [Beschreibung]
-
- Legt in 'pStream' einen 'SfxSingleRecord' an, dessen Content-Gr"o\se
- nicht bekannt ist, sondern nach dam Streamen des Contents errechnet
- werden soll.
-*/
-
-: SfxMiniRecordWriter( pStream, SFX_REC_PRETAG_EXT )
-{
- // Erweiterten Header hiner den des SfxMiniRec schreiben
- *pStream << SFX_REC_HEADER( SFX_REC_TYPE_SINGLE, nContentTag, nContentVer);
-}
-
//=========================================================================
inline bool SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes )
@@ -321,23 +299,6 @@ inline bool SfxSingleRecordReader::ReadHeader_Impl( sal_uInt16 nTypes )
//-------------------------------------------------------------------------
-SfxSingleRecordReader::SfxSingleRecordReader( SvStream *pStream, sal_uInt16 nTag )
-{
- // StartPos merken, um im Fehlerfall zur"uck-seeken zu k"onnen
- sal_uInt32 nStartPos = pStream->Tell();
-
- // richtigen Record suchen, ggf. Error-Code setzen und zur"uck-seeken
- Construct_Impl( pStream );
- if ( !FindHeader_Impl( SFX_REC_TYPE_SINGLE, nTag ) )
- {
- // Error-Code setzen und zur"uck-seeken
- pStream->Seek( nStartPos );
- pStream->SetError( ERRCODE_IO_WRONGFORMAT );
- }
-}
-
-//-------------------------------------------------------------------------
-
bool SfxSingleRecordReader::FindHeader_Impl
(
sal_uInt16 nTypes, // arithm. Veroderung erlaubter Record-Typen
diff --git a/unusedcode.easy b/unusedcode.easy
index 66afcd2..7aead6e 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -368,15 +368,11 @@ LwpGraphicObject::GetRectIn100thMM()
LwpGraphicObject::GetRectInCM()
LwpMiddleLayout::SetScaleCenter(unsigned short)
LwpMiddleLayout::SetScaleHeight(double)
-LwpMiddleLayout::SetScaleMode(unsigned short)
LwpMiddleLayout::SetScalePercentage(unsigned int)
LwpMiddleLayout::SetScaleTile(unsigned short)
LwpMiddleLayout::SetScaleWidth(double)
LwpNumberingOverride::Override(LwpNumberingOverride*)
LwpObject::LwpObject()
-LwpObjectID::GetBuffer(char*)
-LwpObjectID::ReadCompressed(LwpSvStream*, LwpObjectID&)
-LwpObjectStream::QuickReadInt8(bool*)
MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)
@@ -909,8 +905,6 @@ SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
SfxApplication::DdeGetData(String const&, String const&, com::sun::star::uno::Any&)
SfxApplication::DdeSetData(String const&, String const&, com::sun::star::uno::Any const&)
SfxApplication::EnterAsynchronCall_Impl()
-SfxApplication::GetResourceManager() const
-SfxApplication::GetStatusIndicator() const
SfxApplication::InitializeDde()
SfxApplication::LeaveAsynchronCall_Impl()
SfxApplication::Main()
@@ -932,8 +926,6 @@ SfxDispatcher::SetModalMode_Impl(unsigned char)
SfxDispatcher::_Execute(SfxSlotServer const&)
SfxDocTemplate_Impl::GetTemplates(ucbhelper::Content&, ucbhelper::Content&, RegionData_Impl*)
SfxDockingWrapper::GetChildWindowId()
-SfxDocumentTemplateDlg::GetTemplatePath()
-SfxDocumentTemplateDlg::NewTemplate(String const&)
SfxDocumentTemplates::GetCount(String const&) const
SfxDocumentTemplates::GetRegionNo(String const&) const
SfxDocumentTemplates::SaveDir()
@@ -987,17 +979,12 @@ SfxMacroStatement::SfxMacroStatement(SfxShell const&, String const&, unsigned ch
SfxMacroStatement::SfxMacroStatement(String const&)
SfxMacroStatement::SfxMacroStatement(String const&, SfxSlot const&, unsigned char, com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>&)
SfxMailModel::GetCount() const
-SfxMedium::Exists(unsigned char)
SfxMedium::GetDoneLink() const
SfxMedium::GetHdl()
SfxMedium::GetReferer() const
-SfxMedium::StartDownload()
SfxMenuControl::CreateControl(String const&, unsigned short, Menu&, SfxBindings&, SfxVirtualMenu*)
-SfxMenuControl::IsSpecialControl(unsigned short, SfxModule*)
SfxMenuControl::RemovePopup()
SfxMenuControl::SetOwnMenu(SfxVirtualMenu*)
-SfxMenuManager::Construct_Impl(Menu*, unsigned char)
-SfxMenuManager::UseDefault()
SfxModelessDialog::SfxModelessDialog(SfxBindings*, SfxChildWindow*, Window*, long)
SfxModule::IsActive() const
SfxModule::RegisterChildWindowContext(unsigned short, SfxChildWinContextFactory*)
@@ -1047,8 +1034,6 @@ SfxRequest::SetTarget(String const&)
SfxScriptOrganizerItem::SfxScriptOrganizerItem(String const&)
SfxShell::GetBroadcaster()
SfxShell::RemoveItem(unsigned short)
-SfxSingleRecordReader::SfxSingleRecordReader(SvStream*, unsigned short)
-SfxSingleRecordWriter::SfxSingleRecordWriter(SvStream*, unsigned short, unsigned char)
SfxSingleTabDialog::GetInputRanges(SfxItemPool const&)
SfxSizeItem::SfxSizeItem(unsigned short, SvStream&)
SfxSlotPool::NextInterface()
@@ -1151,8 +1136,6 @@ StatusBar::StatusBar(Window*, ResId const&)
StgAvlIterator::Last()
StgCache::Pos2Page(int)
StgDirEntry::Copy(StgDirEntry&)
-StgEntry::GetTime(StgEntryTime) const
-StgEntry::SetTime(StgEntryTime, int*)
StgHeader::SetClassId(ClsId const&)
StorageStream::ValidateMode(unsigned short, StgDirEntry*) const
SvBasicPropertyDataControl::GetData()
@@ -2226,7 +2209,6 @@ binfilter::DbgName_SfxFrameSetDescriptor()
binfilter::DbgName_SfxStringListItem()
binfilter::DbgName_SvxMacroItem()
binfilter::Dictionary::~Dictionary()
-binfilter::E3dDistantLight::SetDirection(binfilter::Vector3D const&)
binfilter::E3dLight::E3dLight(binfilter::Vector3D const&, Color const&, double)
binfilter::EECharAttribArray::Insert(binfilter::EECharAttrib const&, unsigned short)
binfilter::EECharAttribArray::Insert(binfilter::EECharAttribArray const*, unsigned short, unsigned short, unsigned short)
@@ -2239,21 +2221,17 @@ binfilter::GeometryIndexValueBucketMemArr::Insert(binfilter::GeometryIndexValueB
binfilter::GeometryIndexValueBucketMemArr::Replace(char const*&, unsigned short)
binfilter::GeometryIndexValueBucketMemArr::Replace(char const**, unsigned short, unsigned short)
binfilter::GeometryIndexValueBucketMemArr::_ForEach(unsigned short, unsigned short, unsigned char (*)(char const*&, void*), void*)
-binfilter::GetLangName(unsigned short)
-binfilter::GetPortionName(unsigned short)
binfilter::ImpSvtData::~ImpSvtData()
binfilter::InsCapOptArr::Insert(binfilter::InsCapOptArr const*, unsigned short, unsigned short)
binfilter::InsCapOptArr::Insert(binfilter::InsCaptionOpt* const&, unsigned short&)
binfilter::InsCapOptArr::Insert(binfilter::InsCaptionOpt* const*, unsigned short)
binfilter::InsCapOptArr::Remove(binfilter::InsCaptionOpt* const&, unsigned short)
binfilter::InsCapOptArr::Remove(unsigned short, unsigned short)
-binfilter::IsDbg(binfilter::SwTxtFrm const*)
binfilter::OUStringsSort_Impl::Insert(binfilter::OUStringsSort_Impl const*, unsigned short, unsigned short)
binfilter::OUStringsSort_Impl::Insert(rtl::OUString* const&, unsigned short&)
binfilter::OUStringsSort_Impl::Insert(rtl::OUString* const*, unsigned short)
binfilter::OUStringsSort_Impl::Remove(rtl::OUString* const&, unsigned short)
binfilter::OUStringsSort_Impl::Remove(unsigned short, unsigned short)
-binfilter::Outliner::LinkStubEditEngineNotifyHdl(void*, void*)
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetBuffer()
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::GetSize()
binfilter::PCodeBuffConvertor<unsigned int, unsigned short>::PCodeBuffConvertor(unsigned char*, unsigned int)
@@ -2277,14 +2255,11 @@ binfilter::ScBroadcastAreas::Insert(binfilter::ScBroadcastArea* const*, unsigned
binfilter::ScBroadcastAreas::Insert(binfilter::ScBroadcastAreas const*, unsigned short, unsigned short)
binfilter::ScBroadcastAreas::Remove(binfilter::ScBroadcastArea* const&, unsigned short)
binfilter::ScChangeTrack::Remove(binfilter::ScChangeAction*)
-binfilter::ScConditionalFormatList::ResetUsed()
binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormat* const&, unsigned short&)
binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormat* const*, unsigned short)
binfilter::ScConditionalFormats_Impl::Insert(binfilter::ScConditionalFormats_Impl const*, unsigned short, unsigned short)
binfilter::ScConditionalFormats_Impl::Remove(binfilter::ScConditionalFormat* const&, unsigned short)
binfilter::ScConditionalFormats_Impl::Remove(unsigned short, unsigned short)
-binfilter::ScDBData::IsBeyond(unsigned short) const
-binfilter::ScFieldChangerEditEngine::ConvertFields()
binfilter::ScFieldChangerEditEngine::ScFieldChangerEditEngine(binfilter::SfxItemPool*, unsigned char)
binfilter::ScMultipleWriteHeader::ScMultipleWriteHeader(SvStream&, unsigned int)
binfilter::ScMultipleWriteHeader::~ScMultipleWriteHeader()
@@ -2298,8 +2273,6 @@ binfilter::ScValidationEntries_Impl::Insert(binfilter::ScValidationEntries_Impl
binfilter::ScValidationEntries_Impl::Remove(binfilter::ScValidationData* const&, unsigned short)
binfilter::ScValidationEntries_Impl::Remove(unsigned short, unsigned short)
binfilter::ScViewData::ReadUserDataSequence(com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue> const&)
-binfilter::ScXMLImportWrapper::Export(unsigned char)
-binfilter::ScXMLImportWrapper::Import(unsigned char)
binfilter::ScXMLImportWrapper::ScXMLImportWrapper(binfilter::ScDocument&, binfilter::SfxMedium*, binfilter::SvStorage*)
binfilter::SchXMLWrapper::SchXMLWrapper(com::sun::star::uno::Reference<com::sun::star::frame::XModel>&, binfilter::SvStorage&, unsigned char)
binfilter::ScriptTypePosInfos::Insert(binfilter::ScriptTypePosInfos const*, unsigned short, unsigned short, unsigned short)
@@ -2312,16 +2285,12 @@ binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const&
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccess* const*, unsigned short)
binfilter::SdrUnoControlAccessArr::Insert(binfilter::SdrUnoControlAccessArr const*, unsigned short, unsigned short)
binfilter::SdrUnoControlAccessArr::Remove(binfilter::SdrUnoControlAccess* const&, unsigned short)
-binfilter::SfxHintPoster::LinkStubDoEvent_Impl(void*, void*)
binfilter::SfxItemModifyArr_Impl::Insert(binfilter::SfxItemModifyArr_Impl const*, unsigned short, unsigned short, unsigned short)
binfilter::SfxItemModifyArr_Impl::Remove(unsigned short, unsigned short)
binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const&, unsigned short)
binfilter::SfxItemModifyArr_Impl::Replace(binfilter::SfxItemModifyImpl const*, unsigned short, unsigned short)
binfilter::SfxItemModifyArr_Impl::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::SfxItemModifyImpl const&, void*), void*)
-binfilter::SfxMacroConfig::LinkStubCallbackHdl_Impl(void*, void*)
-binfilter::SfxMacroConfig::LinkStubEventHdl_Impl(void*, void*)
binfilter::SfxMultiVarRecordWriter::SfxMultiVarRecordWriter(unsigned char, SvStream*, unsigned short, unsigned char)
-binfilter::SfxObjectShell::GetBaseURL() const
binfilter::SfxPSPropertyArr_Impl::DeleteAndDestroy(unsigned short, unsigned short)
binfilter::SfxPtrArr::Insert(unsigned short, void*)
binfilter::SfxPtrArr::Remove(void*)
@@ -2345,7 +2314,6 @@ binfilter::SortedPositions::Remove(unsigned short, unsigned short)
binfilter::SortedPositions_SAR::Replace(unsigned int const&, unsigned short)
binfilter::SortedPositions_SAR::Replace(unsigned int const*, unsigned short, unsigned short)
binfilter::SortedPositions_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(unsigned int const&, void*), void*)
-binfilter::SvBindStatusCallback::SetProgressCallback(Link const&)
binfilter::SvBools::Insert(binfilter::SvBools const*, unsigned short, unsigned short, unsigned short)
binfilter::SvBools::Replace(unsigned char const&, unsigned short)
binfilter::SvBools::Replace(unsigned char const*, unsigned short, unsigned short)
@@ -2505,7 +2473,6 @@ binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortionArr const*
binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortion_Impl* const&, unsigned short&)
binfilter::SwXBookmarkPortionArr::Insert(binfilter::SwXBookmarkPortion_Impl* const*, unsigned short)
binfilter::SwXBookmarkPortionArr::Remove(binfilter::SwXBookmarkPortion_Impl* const&, unsigned short)
-binfilter::SwXMLSectionList::SwXMLSectionList(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory>, binfilter::SvStrings&)
binfilter::SwXMLTableColumnsSortByWidth_Impl::GetPos(binfilter::SwXMLTableColumn_Impl const*) const
binfilter::SwXMLTableColumnsSortByWidth_Impl::Remove(binfilter::SwXMLTableColumn_Impl*)
binfilter::SwXMLTableColumns_Impl::Insert(binfilter::SwXMLTableColumn_Impl* const&, unsigned short&)
commit 9b845e5814ba8f251986494bed4ec3c64bddcfd3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 16 21:33:41 2011 +0100
regenerate list
diff --git a/svtools/inc/svtools/calendar.hxx b/svtools/inc/svtools/calendar.hxx
index 9d8a8f3..d17d970 100644
--- a/svtools/inc/svtools/calendar.hxx
+++ b/svtools/inc/svtools/calendar.hxx
@@ -273,7 +273,6 @@ private:
#endif
protected:
- void HideDropPos();
DECL_STATIC_LINK( Calendar, ScrollHdl, Timer *);
diff --git a/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index 70f640d..ad78ce8 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.hxx
@@ -273,7 +273,6 @@ private:
SVT_DLLPRIVATE void ImplDrawSelect();
SVT_DLLPRIVATE void ImplHideSelect( sal_uInt16 nItemId );
SVT_DLLPRIVATE void ImplHighlightItem( sal_uInt16 nItemId, sal_Bool bIsSelection = sal_True );
- SVT_DLLPRIVATE void ImplDrawDropPos( sal_Bool bShow );
SVT_DLLPRIVATE void ImplDraw();
using Window::ImplScroll;
SVT_DLLPRIVATE sal_Bool ImplScroll( const Point& rPos );
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index a260c04..71b2884 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -2261,17 +2261,6 @@ Rectangle Calendar::GetDateRect( const Date& rDate ) const
// -----------------------------------------------------------------------
-void Calendar::HideDropPos()
-{
- if ( mbDropPos )
- {
- ImplInvertDropPos();
- mbDropPos = sal_False;
- }
-}
-
-// -----------------------------------------------------------------------
-
void Calendar::StartSelection()
{
if ( mpOldSelectTable )
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 07e24b7..5834f59 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -940,95 +940,6 @@ void ValueSet::ImplHighlightItem( sal_uInt16 nItemId, sal_Bool bIsSelection )
// -----------------------------------------------------------------------
-void ValueSet::ImplDrawDropPos( sal_Bool bShow )
-{
- if ( (mnDropPos != VALUESET_ITEM_NOTFOUND) && !mpImpl->mpItemList->empty() )
- {
- size_t nItemPos = mnDropPos;
- sal_uInt16 nItemId1;
- sal_uInt16 nItemId2 = 0;
- sal_Bool bRight;
- if ( nItemPos >= mpImpl->mpItemList->size() )
- {
- nItemPos = mpImpl->mpItemList->size() - 1;
- bRight = sal_True;
- }
- else
- bRight = sal_False;
-
- nItemId1 = GetItemId( nItemPos );
- if ( (nItemId1 != mnSelItemId) && (nItemId1 != mnHighItemId) )
- nItemId1 = 0;
- Rectangle aRect2 = (*mpImpl->mpItemList)[ nItemPos ]->maRect;
- Rectangle aRect1;
- if ( bRight )
- {
- aRect1 = aRect2;
- aRect2.SetEmpty();
- }
- else if ( nItemPos > 0 )
- {
- aRect1 = (*mpImpl->mpItemList)[ nItemPos-1 ]->maRect;
- nItemId2 = GetItemId( nItemPos-1 );
- if ( (nItemId2 != mnSelItemId) && (nItemId2 != mnHighItemId) )
- nItemId2 = 0;
- }
-
- // Items ueberhaupt sichtbar (nur Erstes/Letztes)
- if ( !aRect1.IsEmpty() || !aRect2.IsEmpty() )
- {
- if ( nItemId1 )
- ImplHideSelect( nItemId1 );
- if ( nItemId2 )
- ImplHideSelect( nItemId2 );
-
- if ( bShow )
- {
- const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
- long nX;
- long nY;
- SetLineColor( rStyleSettings.GetButtonTextColor() );
- if ( !aRect1.IsEmpty() )
- {
- Point aPos = aRect1.RightCenter();
- nX = aPos.X()-2;
- nY = aPos.Y();
- for ( sal_uInt16 i = 0; i < 4; i++ )
- DrawLine( Point( nX-i, nY-i ), Point( nX-i, nY+i ) );
- }
- if ( !aRect2.IsEmpty() )
- {
- Point aPos = aRect2.LeftCenter();
- nX = aPos.X()+2;
- nY = aPos.Y();
- for ( sal_uInt16 i = 0; i < 4; i++ )
- DrawLine( Point( nX+i, nY-i ), Point( nX+i, nY+i ) );
- }
- }
- else
- {
- if ( !aRect1.IsEmpty() )
- {
- Point aPos = aRect1.TopLeft();
- Size aSize = aRect1.GetSize();
- DrawOutDev( aPos, aSize, aPos, aSize, maVirDev );
- }
- if ( !aRect2.IsEmpty() )
- {
- Point aPos = aRect2.TopLeft();
- Size aSize = aRect2.GetSize();
- DrawOutDev( aPos, aSize, aPos, aSize, maVirDev );
- }
- }
-
- if ( nItemId1 || nItemId2 )
- ImplDrawSelect();
- }
- }
-}
-
-// -----------------------------------------------------------------------
-
void ValueSet::ImplDraw()
{
if ( mbFormat )
diff --git a/unusedcode.easy b/unusedcode.easy
index d191997..66afcd2 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -69,6 +69,8 @@ CNames::Insert(ControlItem const*&, unsigned short&)
CNames::Insert(ControlItem const**, unsigned short)
CNames::Remove(ControlItem const*&, unsigned short)
CNames::Remove(unsigned short, unsigned short)
+CalendarWrapper::setFirstDayOfWeek(short)
+CalendarWrapper::setMinimumNumberOfDaysForFirstWeek(short)
CertificateContainer::impl_createFactory(com::sun::star::uno::Reference<com::sun::star::lang::XMultiServiceFactory> const&)
CertificateExtension_XmlSecImpl::setCertExtn(com::sun::star::uno::Sequence<signed char>, com::sun::star::uno::Sequence<signed char>, unsigned char)
CfgStack::Push(CfgStackData*)
commit eb5323cd72ad929505d34520fbbee3eedf82feb5
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 16 15:09:13 2011 +0100
windows unused variables warnings
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index 3dccb36..044335f 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -200,7 +200,7 @@ FormViewPageWindowAdapter::FormViewPageWindowAdapter( const ::comphelper::Compon
setController( xForm, NULL );
}
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -237,7 +237,7 @@ void FormViewPageWindowAdapter::dispose()
Reference< XComponent > xComp( xController, UNO_QUERY_THROW );
xComp->dispose();
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -430,7 +430,7 @@ void FormViewPageWindowAdapter::updateTabOrder( const Reference< XForm >& _rxFor
setController( _rxForm, xParentController );
}
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -554,7 +554,7 @@ void SAL_CALL FmXFormView::elementInserted(const ContainerEvent& evt) throw( Run
pAdapter->updateTabOrder( xForm );
}
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -833,7 +833,7 @@ bool FmXFormView::isFocusable( const Reference< XControl >& i_rControl )
return true;
}
}
- catch( const Exception& e )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -892,7 +892,7 @@ namespace
pFormObject->GetUnoControl( _rView, _rWindow );
}
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -985,7 +985,7 @@ IMPL_LINK(FmXFormView, OnAutoFocus, void*, /*EMPTYTAG*/)
m_pView->MakeVisible( pCurrentWindow->PixelToLogic( aNonUnoRect ), *const_cast< Window* >( pCurrentWindow ) );
}
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -1046,7 +1046,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
{
OSL_VERIFY( m_xLastCreatedControlModel->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId );
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -1078,7 +1078,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
{
m_aContext.createComponentWithArguments( pWizardAsciiName, aWizardArgs.getWrappedPropertyValues(), xWizard );
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -1094,7 +1094,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
{
xWizard->execute();
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -1181,11 +1181,14 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
m_aContext.getLegacyServiceFactory()
) );
}
- catch ( const SQLException& )
+ catch (const SQLException&)
{
aError.Reason = ::cppu::getCaughtException();
}
- catch( const Exception& ) { /* will be asserted below */ }
+ catch (const Exception& )
+ {
+ /* will be asserted below */
+ }
if (aError.Reason.hasValue())
{
displayAsyncErrorMessage( aError );
@@ -1348,7 +1351,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
return pGroup; // und fertig
}
- catch(const Exception&)
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
@@ -1478,7 +1481,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor
return pControl;
}
}
- catch(const Exception&)
+ catch (const Exception&)
{
OSL_FAIL("FmXFormView::implCreateXFormsControl: caught an exception while creating the control !");
}
@@ -1654,7 +1657,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
{
xControlSet->setPropertyValue( FM_PROP_CONTROLLABEL, makeAny( xLabelModel ) );
}
- catch( const Exception& )
+ catch (const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
More information about the Libreoffice-commits
mailing list