[Libreoffice-commits] core.git: 88 commits - basegfx/source basic/qa chart2/source comphelper/source connectivity/source cppcanvas/source cppu/qa dbaccess/source desktop/source drawinglayer/source extensions/source filter/source forms/source fpicker/source i18nutil/source include/filter include/tools lotuswordpro/source pyuno/source reportdesign/source sal/qa sal/rtl sc/source sdext/source sd/source shell/source slideshow/source svx/source sw/source testtools/source ucb/source vcl/source vcl/unx xmloff/source
Stephan Bergmann
sbergman at redhat.com
Thu Nov 14 01:15:55 PST 2013
basegfx/source/range/b2drangeclipper.cxx | 6
basic/qa/cppunit/basic_coverage.cxx | 11
basic/qa/cppunit/test_vba.cxx | 58 +-
chart2/source/controller/dialogs/DialogModel.cxx | 12
chart2/source/controller/main/DrawCommandDispatch.cxx | 4
comphelper/source/property/propertycontainerhelper.cxx | 8
connectivity/source/commontools/RowFunctionParser.cxx | 5
connectivity/source/commontools/dbtools.cxx | 6
cppcanvas/source/mtfrenderer/textaction.cxx | 2
cppu/qa/test_unotype.cxx | 14
dbaccess/source/core/misc/dsntypes.cxx | 6
dbaccess/source/filter/xml/xmlExport.cxx | 1
dbaccess/source/ui/tabledesign/TableController.cxx | 9
desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 8
drawinglayer/source/primitive2d/metafileprimitive2d.cxx | 5
extensions/source/update/feed/updatefeed.cxx | 2
filter/source/svg/svgreader.cxx | 23 -
forms/source/xforms/convert.cxx | 142 ------
fpicker/source/office/OfficeControlAccess.cxx | 9
fpicker/source/office/iodlg.cxx | 14
i18nutil/source/utility/unicode.cxx | 2
include/filter/msfilter/escherex.hxx | 72 +--
include/tools/resid.hxx | 2
lotuswordpro/source/filter/lwpsdwdrawheader.hxx | 3
pyuno/source/module/pyuno_module.cxx | 12
reportdesign/source/ui/inspection/GeometryHandler.cxx | 4
reportdesign/source/ui/report/ReportController.cxx | 4
reportdesign/source/ui/report/ViewsWindow.cxx | 10
sal/qa/rtl/textenc/rtl_tencinfo.cxx | 114 -----
sal/rtl/bootstrap.cxx | 5
sal/rtl/logfile.cxx | 217 ++++------
sal/rtl/math.cxx | 14
sc/source/core/data/column.cxx | 30 -
sc/source/core/data/column2.cxx | 15
sc/source/core/data/documen8.cxx | 3
sc/source/core/tool/rangelst.cxx | 23 -
sc/source/core/tool/rangenam.cxx | 11
sc/source/filter/oox/formulabuffer.cxx | 2
sc/source/filter/oox/numberformatsbuffer.cxx | 2
sc/source/filter/orcus/interface.cxx | 49 --
sc/source/filter/xml/xmlexprt.cxx | 31 -
sc/source/filter/xml/xmlimprt.cxx | 31 -
sc/source/ui/unoobj/chart2uno.cxx | 12
sd/source/filter/eppt/epptso.cxx | 6
sd/source/filter/eppt/pptx-epptooxml.cxx | 2
sd/source/ui/framework/tools/FrameworkHelper.cxx | 23 +
sd/source/ui/inc/framework/FrameworkHelper.hxx | 33 -
sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx | 5
sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx | 4
sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 10
sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx | 2
sd/source/ui/view/DocumentRenderer.cxx | 17
sdext/source/pdfimport/filterdet.cxx | 130 -----
sdext/source/pdfimport/pdfparse/pdfparse.cxx | 3
sdext/source/presenter/PresenterTheme.cxx | 20
sdext/source/presenter/PresenterTimer.cxx | 2
sdext/source/presenter/PresenterToolBar.cxx | 2
sdext/source/presenter/PresenterViewFactory.cxx | 22 -
shell/source/tools/lngconvex/lngconvex.cxx | 3
shell/source/unix/exec/shellexec.cxx | 2
slideshow/source/engine/expressionnodefactory.cxx | 15
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 2
slideshow/source/engine/slideview.cxx | 9
slideshow/source/engine/tools.cxx | 17
slideshow/source/engine/usereventqueue.cxx | 5
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 21
svx/source/sidebar/EmptyPanel.cxx | 13
svx/source/sidebar/tools/ColorControl.cxx | 3
svx/source/svdraw/svdotextpathdecomposition.cxx | 4
sw/source/core/doc/docbm.cxx | 5
sw/source/core/docnode/nodedump.cxx | 6
sw/source/filter/ww8/styles.cxx | 10
testtools/source/bridgetest/constructors.cxx | 3
ucb/source/ucp/gio/gio_inputstream.cxx | 2
vcl/source/fontsubset/cff.cxx | 4
vcl/unx/generic/app/randrwrapper.cxx | 24 -
vcl/unx/gtk/a11y/atkaction.cxx | 8
vcl/unx/gtk/a11y/atkcomponent.cxx | 10
vcl/unx/gtk/a11y/atkeditabletext.cxx | 14
vcl/unx/gtk/a11y/atkhypertext.cxx | 18
vcl/unx/gtk/a11y/atkimage.cxx | 4
vcl/unx/gtk/a11y/atkselection.cxx | 14
vcl/unx/gtk/a11y/atktable.cxx | 38 -
vcl/unx/gtk/a11y/atktext.cxx | 32 -
vcl/unx/gtk/a11y/atktextattributes.cxx | 2
vcl/unx/gtk/a11y/atkvalue.cxx | 8
vcl/unx/gtk/a11y/atkwrapper.cxx | 18
xmloff/source/core/DocumentSettingsContext.cxx | 6
xmloff/source/style/xmlexppr.cxx | 11
89 files changed, 307 insertions(+), 1318 deletions(-)
New commits:
commit 7377aaa1aec90f105b6c5d56a2c9453081b2b8ba
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 14 10:14:18 2013 +0100
Use rtl::Static
Change-Id: I391e027b2567c4239c1d02e132c6508b3f49d381
diff --git a/sal/rtl/logfile.cxx b/sal/rtl/logfile.cxx
index 8bcef42..a78eb08 100644
--- a/sal/rtl/logfile.cxx
+++ b/sal/rtl/logfile.cxx
@@ -49,48 +49,6 @@ using ::rtl::OUStringBuffer;
namespace {
-static oslFileHandle g_aFile = 0;
-static sal_Bool g_bHasBeenCalled = sal_False;
-static const sal_Int32 g_BUFFERSIZE = 4096;
-static sal_Char *g_buffer = 0;
-
-class LoggerGuard
-{
-public:
- ~LoggerGuard();
-};
-
-LoggerGuard::~LoggerGuard()
-{
- if( g_buffer )
- {
- sal_Int64 nWritten, nConverted =
- sprintf( g_buffer, "closing log file at %06" SAL_PRIuUINT32, osl_getGlobalTimer() );
- if( nConverted > 0 )
- osl_writeFile( g_aFile, g_buffer, nConverted, (sal_uInt64 *)&nWritten );
- osl_closeFile( g_aFile );
- g_aFile = 0;
-
- rtl_freeMemory( g_buffer );
- g_buffer = 0;
- g_bHasBeenCalled = sal_False;
- }
-}
-
-// The destructor of this static LoggerGuard is "activated" by the assignment to
-// g_buffer in init():
-LoggerGuard loggerGuard;
-
-namespace
-{
- class theLogMutex : public rtl::Static<osl::Mutex, theLogMutex>{};
-}
-
-static Mutex & getLogMutex()
-{
- return theLogMutex::get();
-}
-
OUString getFileUrl( const OUString &name )
{
OUString aRet;
@@ -108,124 +66,144 @@ OUString getFileUrl( const OUString &name )
return aRet;
}
-void init() {
- if( !g_bHasBeenCalled )
+static const sal_Int32 g_BUFFERSIZE = 4096;
+
+struct Logger {
+ oslFileHandle aFile;
+ sal_Char *buffer;
+ osl::Mutex mutex;
+
+ Logger();
+
+ ~Logger();
+};
+
+Logger::Logger(): aFile(0), buffer(0)
+{
+ OUString name( "RTL_LOGFILE" );
+ OUString value;
+ if( rtl_bootstrap_get( name.pData, &value.pData, 0 ) )
{
- MutexGuard guard( getLogMutex() );
- if( ! g_bHasBeenCalled )
+ // Obtain process id.
+ oslProcessIdentifier aProcessId = 0;
+ oslProcessInfo info;
+ info.Size = sizeof (oslProcessInfo);
+ if (osl_getProcessInfo (0, osl_Process_IDENTIFIER, &info) == osl_Process_E_None)
+ aProcessId = info.Ident;
+
+ // Construct name of log file and open the file.
+ OUStringBuffer buf( 128 );
+ buf.append( value );
+
+ // if the filename ends with .nopid, the incoming filename is not modified
+ if( value.getLength() < 6 /* ".nopid" */ ||
+ rtl_ustr_ascii_compare_WithLength(
+ value.getStr() + (value.getLength()-6) , 6 , ".nopid" ) )
{
- OUString name( "RTL_LOGFILE" );
- OUString value;
- if( rtl_bootstrap_get( name.pData, &value.pData, 0 ) )
- {
- // Obtain process id.
- oslProcessIdentifier aProcessId = 0;
- oslProcessInfo info;
- info.Size = sizeof (oslProcessInfo);
- if (osl_getProcessInfo (0, osl_Process_IDENTIFIER, &info) == osl_Process_E_None)
- aProcessId = info.Ident;
-
- // Construct name of log file and open the file.
- OUStringBuffer buf( 128 );
- buf.append( value );
-
- // if the filename ends with .nopid, the incoming filename is not modified
- if( value.getLength() < 6 /* ".nopid" */ ||
- rtl_ustr_ascii_compare_WithLength(
- value.getStr() + (value.getLength()-6) , 6 , ".nopid" ) )
- {
- buf.appendAscii( "_" );
- buf.append( (sal_Int32) aProcessId );
- buf.appendAscii( ".log" );
- }
+ buf.appendAscii( "_" );
+ buf.append( (sal_Int32) aProcessId );
+ buf.appendAscii( ".log" );
+ }
- OUString o = getFileUrl( buf.makeStringAndClear() );
- oslFileError e = osl_openFile(
- o.pData, &g_aFile, osl_File_OpenFlag_Write|osl_File_OpenFlag_Create);
+ OUString o = getFileUrl( buf.makeStringAndClear() );
+ oslFileError e = osl_openFile(
+ o.pData, &aFile, osl_File_OpenFlag_Write|osl_File_OpenFlag_Create);
- if( osl_File_E_None == e )
- {
- TimeValue aCurrentTime;
- g_buffer = ( sal_Char * ) rtl_allocateMemory( g_BUFFERSIZE );
- sal_Int64 nConverted = 0;
- if (osl_getSystemTime (&aCurrentTime))
- {
- nConverted = (sal_Int64 ) sprintf (
- g_buffer,
- "opening log file %f seconds past January 1st 1970\n"
- "corresponding to %" SAL_PRIuUINT32 " ms after timer start\n",
- aCurrentTime.Seconds + 1e-9 * aCurrentTime.Nanosec,
- osl_getGlobalTimer());
-
- if( nConverted > 0 )
- {
- sal_Int64 nWritten;
- osl_writeFile( g_aFile, g_buffer, nConverted , (sal_uInt64 *)&nWritten );
- }
- }
-
- nConverted = sprintf (g_buffer, "Process id is %" SAL_PRIuUINT32 "\n", aProcessId);
- if( nConverted )
- {
- sal_Int64 nWritten;
- osl_writeFile( g_aFile, g_buffer, nConverted, (sal_uInt64 *)&nWritten );
- }
- }
- else
+ if( osl_File_E_None == e )
+ {
+ TimeValue aCurrentTime;
+ buffer = ( sal_Char * ) rtl_allocateMemory( g_BUFFERSIZE );
+ sal_Int64 nConverted = 0;
+ if (osl_getSystemTime (&aCurrentTime))
+ {
+ nConverted = (sal_Int64 ) sprintf (
+ buffer,
+ "opening log file %f seconds past January 1st 1970\n"
+ "corresponding to %" SAL_PRIuUINT32 " ms after timer start\n",
+ aCurrentTime.Seconds + 1e-9 * aCurrentTime.Nanosec,
+ osl_getGlobalTimer());
+
+ if( nConverted > 0 )
{
- SAL_WARN(
- "sal.rtl",
- "Couldn't open logfile " << o << '(' << +e << ')');
+ sal_Int64 nWritten;
+ osl_writeFile( aFile, buffer, nConverted , (sal_uInt64 *)&nWritten );
}
}
- g_bHasBeenCalled = sal_True;
+
+ nConverted = sprintf (buffer, "Process id is %" SAL_PRIuUINT32 "\n", aProcessId);
+ if( nConverted )
+ {
+ sal_Int64 nWritten;
+ osl_writeFile( aFile, buffer, nConverted, (sal_uInt64 *)&nWritten );
+ }
+ }
+ else
+ {
+ SAL_WARN(
+ "sal.rtl",
+ "Couldn't open logfile " << o << '(' << +e << ')');
}
}
}
+Logger::~Logger()
+{
+ if( buffer )
+ {
+ sal_Int64 nWritten, nConverted =
+ sprintf( buffer, "closing log file at %06" SAL_PRIuUINT32, osl_getGlobalTimer() );
+ if( nConverted > 0 )
+ osl_writeFile( aFile, buffer, nConverted, (sal_uInt64 *)&nWritten );
+ osl_closeFile( aFile );
+ rtl_freeMemory( buffer );
+ }
+}
+
+struct theLogger: public rtl::Static<Logger, theLogger> {};
+
}
extern "C" void SAL_CALL rtl_logfile_trace ( const char *pszFormat, ... )
{
- init();
- if( g_buffer )
+ Logger & logger = theLogger::get();
+ if( logger.buffer )
{
va_list args;
va_start(args, pszFormat);
{
sal_Int64 nConverted, nWritten;
- MutexGuard guard( getLogMutex() );
- nConverted = vsnprintf( g_buffer , g_BUFFERSIZE, pszFormat, args );
+ MutexGuard guard( logger.mutex );
+ nConverted = vsnprintf( logger.buffer , g_BUFFERSIZE, pszFormat, args );
nConverted = (nConverted > g_BUFFERSIZE ? g_BUFFERSIZE : nConverted );
if( nConverted > 0 )
- osl_writeFile( g_aFile, g_buffer, nConverted, (sal_uInt64*)&nWritten );
+ osl_writeFile( logger.aFile, logger.buffer, nConverted, (sal_uInt64*)&nWritten );
}
va_end(args);
}
}
extern "C" void SAL_CALL rtl_logfile_longTrace(char const * format, ...) {
- init();
- if (g_buffer != 0) {
+ Logger & logger = theLogger::get();
+ if (logger.buffer != 0) {
sal_uInt32 time = osl_getGlobalTimer();
oslThreadIdentifier threadId = osl::Thread::getCurrentIdentifier();
va_list args;
va_start(args, format);
{
- MutexGuard g(getLogMutex());
+ MutexGuard g(logger.mutex);
int n1 = snprintf(
- g_buffer, g_BUFFERSIZE, "%06" SAL_PRIuUINT32 " %" SAL_PRIuUINT32 " ", time, threadId);
+ logger.buffer, g_BUFFERSIZE, "%06" SAL_PRIuUINT32 " %" SAL_PRIuUINT32 " ", time, threadId);
if (n1 >= 0) {
sal_uInt64 n2;
osl_writeFile(
- g_aFile, g_buffer,
+ logger.aFile, logger.buffer,
static_cast< sal_uInt64 >(
std::min(n1, static_cast< int >(g_BUFFERSIZE))),
&n2);
- n1 = vsnprintf(g_buffer, g_BUFFERSIZE, format, args);
+ n1 = vsnprintf(logger.buffer, g_BUFFERSIZE, format, args);
if (n1 > 0) {
osl_writeFile(
- g_aFile, g_buffer,
+ logger.aFile, logger.buffer,
static_cast< sal_uInt64 >(
std::min(n1, static_cast< int >(g_BUFFERSIZE))),
&n2);
@@ -237,8 +215,7 @@ extern "C" void SAL_CALL rtl_logfile_longTrace(char const * format, ...) {
}
extern "C" sal_Bool SAL_CALL rtl_logfile_hasLogFile( void ) {
- init();
- return g_buffer != 0;
+ return theLogger::get().buffer != 0;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 388734a14fbb13bf5960d80801d9bf38a1fb408a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Nov 14 09:45:20 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I535617f838f8b0ed7b767c449f40cb54a872be27
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx
index d601d7b..910f056 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -948,8 +948,6 @@ namespace
{
eEndDragObj,
eEndAction,
- eMoveAction,
- eMarkAction,
eForceToAnotherPage,
eBreakAction
};
@@ -958,12 +956,10 @@ namespace
private:
SectionViewAction m_eAction;
sal_Bool m_bCopy;
- Point m_aPoint;
public:
ApplySectionViewAction( sal_Bool _bCopy ) : m_eAction( eEndDragObj ), m_bCopy( _bCopy ) { }
ApplySectionViewAction(SectionViewAction _eAction = eEndAction ) : m_eAction( _eAction ) { }
- ApplySectionViewAction( const Point& _rPoint, SectionViewAction _eAction = eMoveAction ) : m_eAction( _eAction ), m_bCopy( sal_False ), m_aPoint( _rPoint ) { }
void operator() ( const OViewsWindow::TSectionsMap::value_type& _rhs )
{
@@ -977,12 +973,6 @@ namespace
if ( rView.IsAction() )
rView.EndAction ( );
break;
- case eMoveAction:
- rView.MovAction ( m_aPoint );
- break;
- case eMarkAction:
- rView.BegMarkObj ( m_aPoint );
- break;
case eForceToAnotherPage:
rView.ForceMarkedToAnotherPage();
break;
commit 2a6976dfa90adcf9390713a6dcb5bc5e2679c3b4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 23:50:48 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I32e4a80e99885c561a30e8f059c9b9a24c4bd3c7
diff --git a/basic/qa/cppunit/test_vba.cxx b/basic/qa/cppunit/test_vba.cxx
index cf04790..94637f3 100644
--- a/basic/qa/cppunit/test_vba.cxx
+++ b/basic/qa/cppunit/test_vba.cxx
@@ -17,7 +17,6 @@ namespace
class VBATest : public test::BootstrapFixture
{
- bool hasOLEEnv();
public:
VBATest() : BootstrapFixture(true, false) {}
~VBATest(){}
@@ -28,44 +27,13 @@ namespace
// Declares the method as a test to call
CPPUNIT_TEST(testMiscVBAFunctions);
-// not much point even trying to run except on windows
-#if defined(WNT)
CPPUNIT_TEST(testMiscOLEStuff);
-#endif
// End of test suite definition
CPPUNIT_TEST_SUITE_END();
};
-bool VBATest::hasOLEEnv()
-{
- // test if we have the necessary runtime environment
- // to run the OLE tests.
- static uno::Reference< lang::XMultiServiceFactory > xOLEFactory;
- if ( !xOLEFactory.is() )
- {
- uno::Reference< uno::XComponentContext > xContext(
- comphelper::getProcessComponentContext() );
- if( xContext.is() )
- {
- uno::Reference<lang::XMultiComponentFactory> xSMgr = xContext->getServiceManager();
- xOLEFactory = uno::Reference<lang::XMultiServiceFactory>(
- xSMgr->createInstanceWithContext(
- "com.sun.star.bridge.OleObjectFactory",
- xContext ), uno::UNO_QUERY );
- }
- }
- bool bOk = false;
- if( xOLEFactory.is() )
- {
- uno::Reference< uno::XInterface > xExcel = xOLEFactory->createInstance( "Excel.Application" );
- uno::Reference< uno::XInterface > xADODB = xOLEFactory->createInstance( "ADODB.Connection" );
- bOk = xExcel.is() && xADODB.is();
- }
- return bOk;
-}
-
void VBATest::testMiscVBAFunctions()
{
const char* macroSource[] = {
@@ -107,8 +75,29 @@ void VBATest::testMiscVBAFunctions()
void VBATest::testMiscOLEStuff()
{
- bool bCanRunOleTests = hasOLEEnv();
- if ( !bCanRunOleTests )
+// not much point even trying to run except on windows
+#if defined(WNT)
+ // test if we have the necessary runtime environment
+ // to run the OLE tests.
+ uno::Reference< lang::XMultiServiceFactory > xOLEFactory;
+ uno::Reference< uno::XComponentContext > xContext(
+ comphelper::getProcessComponentContext() );
+ if( xContext.is() )
+ {
+ uno::Reference<lang::XMultiComponentFactory> xSMgr = xContext->getServiceManager();
+ xOLEFactory = uno::Reference<lang::XMultiServiceFactory>(
+ xSMgr->createInstanceWithContext(
+ "com.sun.star.bridge.OleObjectFactory",
+ xContext ), uno::UNO_QUERY );
+ }
+ bool bOk = false;
+ if( xOLEFactory.is() )
+ {
+ uno::Reference< uno::XInterface > xExcel = xOLEFactory->createInstance( "Excel.Application" );
+ uno::Reference< uno::XInterface > xADODB = xOLEFactory->createInstance( "ADODB.Connection" );
+ bOk = xExcel.is() && xADODB.is();
+ }
+ if ( !bOk )
return; // can't do anything, skip test
const char* macroSource[] = {
@@ -142,6 +131,7 @@ void VBATest::testMiscOLEStuff()
CPPUNIT_ASSERT_MESSAGE("No return variable huh?", pReturn != NULL );
CPPUNIT_ASSERT_MESSAGE("Result not as expected", pReturn->GetOUString() == "OK" );
}
+#endif
}
// Put the test suite in the registry
commit 1b3e9bcdfa0376c29685be9ab8a838aa61af9814
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 23:38:48 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I4e47b5194992d3847a689284d7600be92a4ead26
diff --git a/basic/qa/cppunit/basic_coverage.cxx b/basic/qa/cppunit/basic_coverage.cxx
index 8c16681..f05771c 100644
--- a/basic/qa/cppunit/basic_coverage.cxx
+++ b/basic/qa/cppunit/basic_coverage.cxx
@@ -21,16 +21,13 @@ class Coverage : public test::BootstrapFixture
{
private:
typedef std::vector< OUString > StringVec;
- int m_nb_tests;
int m_nb_tests_ok;
int m_nb_tests_skipped;
OUString m_sCurrentTest;
void process_directory(OUString sDirName);
void run_test(OUString sFileName);
- void test_start(OUString /* sFileName */);
void test_failed(void);
void test_success(void);
- void print_summary() {};
StringVec get_subdirnames( const OUString& sDirName );
public:
@@ -51,7 +48,6 @@ public:
Coverage::Coverage()
: BootstrapFixture(true, false)
- , m_nb_tests(0)
, m_nb_tests_ok(0)
, m_nb_tests_skipped(0)
{
@@ -62,12 +58,6 @@ Coverage::~Coverage()
fprintf(stderr,"basic coverage Summary : skipped:%d pass:%d\n", m_nb_tests_skipped, m_nb_tests_ok );
}
-void Coverage::test_start(OUString sFileName)
-{
- m_nb_tests += 1;
- m_sCurrentTest = sFileName;
-}
-
void Coverage::test_failed()
{
CPPUNIT_FAIL(
@@ -82,6 +72,7 @@ void Coverage::test_success()
void Coverage::run_test(OUString sFileURL)
{
+ m_sCurrentTest = sFileURL;
bool result = false;
MacroSnippet testMacro;
testMacro.LoadSourceFromFile( sFileURL );
commit f71f94acd8e33b4b4afa0787911ebe2a1d8c784e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 21:46:54 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I3a788db0fe215c7ce3a69c3dad2b8a72f4db88ee
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 4ed1227..50a4aea 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -183,10 +183,6 @@ namespace
{
return x.Name.equals(y);
}
- bool operator() (const OUString& x,const beans::PropertyValue& y) const
- {
- return x.equals(y.Name);
- }
};
void lcl_setFontWPU_nothrow(const uno::Reference< report::XReportControlFormat>& _xReportControlFormat,const sal_Int32 _nId)
commit 81d3ccfdd0fa7e448a493ee242333b32722b41bc
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 21:44:17 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I15d27e5bd372c15c920abc6abf1737ce2d43e2ce
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index d50cbb1..0bfcd04 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -121,10 +121,6 @@ struct PropertyCompare : public ::std::binary_function< beans::Property, OUStrin
{
return x.Name.equals(y);
}
- bool operator() (const OUString& x,const beans::Property& y) const
- {
- return x.equals(y.Name);
- }
};
// -----------------------------------------------------------------------------
commit 3026e7a91fb0c93c18b0d988f6f88c936f439290
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 20:49:11 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: Idb21a2fcceccf037e0f8ca56905306b359779813
diff --git a/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index a112d4f..a87fe6c 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.cxx
@@ -338,7 +338,7 @@ wrapper_get_name( AtkObject *atk_obj )
atk_obj->name = g_strdup(aName.getStr());
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleName()" );
}
}
@@ -365,7 +365,7 @@ wrapper_get_description( AtkObject *atk_obj )
g_free(atk_obj->description);
atk_obj->description = g_strdup(aDescription.getStr());
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleDescription()" );
}
}
@@ -388,7 +388,7 @@ wrapper_get_n_children( AtkObject *atk_obj )
try {
n = xContext->getAccessibleChildCount();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
OSL_FAIL("Exception in getAccessibleChildCount()" );
}
}
@@ -421,7 +421,7 @@ wrapper_ref_child( AtkObject *atk_obj,
child = atk_object_wrapper_ref( xAccessible );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
OSL_FAIL("Exception in getAccessibleChild");
}
}
@@ -448,7 +448,7 @@ wrapper_get_index_in_parent( AtkObject *atk_obj )
obj->mpAccessible, i);
#endif
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleIndexInParent()" );
}
}
@@ -494,7 +494,7 @@ wrapper_ref_relation_set( AtkObject *atk_obj )
g_object_unref( G_OBJECT( pRel ) );
}
}
- catch(const uno::Exception &e) {
+ catch(const uno::Exception &) {
g_object_unref( G_OBJECT( pSet ) );
pSet = NULL;
}
@@ -533,7 +533,7 @@ wrapper_ref_state_set( AtkObject *atk_obj )
}
}
- catch(const uno::Exception &e) {
+ catch(const uno::Exception &) {
g_warning( "Exception in wrapper_ref_state_set" );
atk_state_set_add_state( pSet, ATK_STATE_DEFUNCT );
}
@@ -640,7 +640,7 @@ isOfType( uno::XInterface *pInterface, const uno::Type & rType )
bIs = ( ( typelib_TypeClass_INTERFACE == aRet.pType->eTypeClass ) &&
( aRet.pReserved != NULL ) );
- } catch( const uno::Exception &e) { }
+ } catch( const uno::Exception &) { }
return bIs;
}
@@ -826,7 +826,7 @@ atk_object_wrapper_new( const ::com::sun::star::uno::Reference< ::com::sun::star
return ATK_OBJECT( pWrap );
}
- catch (const uno::Exception &e)
+ catch (const uno::Exception &)
{
if( pWrap )
g_object_unref( pWrap );
commit c21304822685e463052f4cdff64c31c97d3394fa
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 19:59:56 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: I9858795019e5b15965cdfe9f186129a93b6d52ad
diff --git a/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx
index af8cdb3..46abdfd 100644
--- a/vcl/unx/gtk/a11y/atkvalue.cxx
+++ b/vcl/unx/gtk/a11y/atkvalue.cxx
@@ -68,7 +68,7 @@ value_wrapper_get_current_value( AtkValue *value,
if( pValue )
anyToGValue( pValue->getCurrentValue(), gval );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getCurrentValue()" );
}
}
@@ -82,7 +82,7 @@ value_wrapper_get_maximum_value( AtkValue *value,
if( pValue )
anyToGValue( pValue->getMaximumValue(), gval );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getCurrentValue()" );
}
}
@@ -96,7 +96,7 @@ value_wrapper_get_minimum_value( AtkValue *value,
if( pValue )
anyToGValue( pValue->getMinimumValue(), gval );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getCurrentValue()" );
}
}
@@ -116,7 +116,7 @@ value_wrapper_set_current_value( AtkValue *value,
return pValue->setCurrentValue( aAny );
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getCurrentValue()" );
}
commit 07b9bec1a6ebdae111d0def33692ffa3efe61dad
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 19:59:32 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: I17f7fd32c020443d48c2488f7db32519a8d11831
diff --git a/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 130c866..54a2d6c 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.cxx
@@ -269,7 +269,7 @@ get_color_value(const uno::Sequence< beans::PropertyValue >& rAttributeList,
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in get[Fore|Back]groundColor()" );
}
}
commit c8497ae116db47958ba921d03cb1824476b59a49
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 19:59:21 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: I855297c68d2be1a35c8c6a438f64defb8ac377cc
diff --git a/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx
index 5ac68562..bbcb420 100644
--- a/vcl/unx/gtk/a11y/atktext.cxx
+++ b/vcl/unx/gtk/a11y/atktext.cxx
@@ -294,7 +294,7 @@ text_wrapper_get_text (AtkText *text,
ret = g_strdup( OUStringToOString(aText, RTL_TEXTENCODING_UTF8 ).getStr() );
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getText()" );
}
@@ -319,7 +319,7 @@ text_wrapper_get_text_after_offset (AtkText *text,
return adjust_boundaries(pText, aTextSegment, boundary_type, start_offset, end_offset);
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in get_text_after_offset()" );
}
@@ -359,7 +359,7 @@ text_wrapper_get_text_at_offset (AtkText *text,
return adjust_boundaries(pText, aTextSegment, boundary_type, start_offset, end_offset);
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in get_text_at_offset()" );
}
@@ -400,7 +400,7 @@ text_wrapper_get_text_before_offset (AtkText *text,
return adjust_boundaries(pText, aTextSegment, boundary_type, start_offset, end_offset);
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in text_before_offset()" );
}
@@ -417,7 +417,7 @@ text_wrapper_get_caret_offset (AtkText *text)
if( pText )
offset = pText->getCaretPosition();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getCaretPosition()" );
}
@@ -437,7 +437,7 @@ text_wrapper_set_caret_offset (AtkText *text,
if( pText )
return pText->setCaretPosition( offset );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in setCaretPosition()" );
}
@@ -589,7 +589,7 @@ text_wrapper_get_run_attributes( AtkText *text,
offset, pSet, start_offset, end_offset );
}
}
- catch(const uno::Exception& e){
+ catch(const uno::Exception&){
g_warning( "Exception in get_run_attributes()" );
@@ -620,7 +620,7 @@ text_wrapper_get_default_attributes( AtkText *text )
pSet = attribute_set_new_from_property_values( aAttributeList, false, text );
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in get_default_attributes()" );
@@ -672,7 +672,7 @@ text_wrapper_get_character_extents( AtkText *text,
#endif
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getCharacterBounds" );
}
}
@@ -687,7 +687,7 @@ text_wrapper_get_character_count (AtkText *text)
if( pText )
rv = pText->getCharacterCount();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getCharacterCount" );
}
@@ -720,7 +720,7 @@ text_wrapper_get_offset_at_point (AtkText *text,
return pText->getIndexAtPoint( awt::Point(x - origin_x, y - origin_y) );
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getIndexAtPoint" );
}
@@ -739,7 +739,7 @@ text_wrapper_get_n_selections (AtkText *text)
if( pText )
rv = ( pText->getSelectionEnd() > pText->getSelectionStart() ) ? 1 : 0;
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getSelectionEnd() or getSelectionStart()" );
}
@@ -768,7 +768,7 @@ text_wrapper_get_selection (AtkText *text,
return OUStringToGChar( pText->getSelectedText() );
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getSelectionEnd(), getSelectionStart() or getSelectedText()" );
}
@@ -788,7 +788,7 @@ text_wrapper_add_selection (AtkText *text,
if( pText )
return pText->setSelection( start_offset, end_offset ); // ?
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in setSelection()" );
}
@@ -806,7 +806,7 @@ text_wrapper_remove_selection (AtkText *text,
if( pText )
return pText->setSelection( 0, 0 ); // ?
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in setSelection()" );
}
@@ -826,7 +826,7 @@ text_wrapper_set_selection (AtkText *text,
if( pText )
return pText->setSelection( start_offset, end_offset );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in setSelection()" );
}
commit 8b47d21e890f3816731b6992f8c0fc4d1f2581d0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 19:46:43 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: If4952a5e36ba52f07231560f4bd3cc568b9fde52
diff --git a/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index 662eec1..60bb7fe 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.cxx
@@ -101,7 +101,7 @@ table_wrapper_ref_at (AtkTable *table,
return atk_object_wrapper_conditional_ref( pTable->getAccessibleCellAt( row, column ) );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleCellAt()" );
}
@@ -127,7 +127,7 @@ table_wrapper_get_index_at (AtkTable *table,
if( pTable )
return pTable->getAccessibleIndex( row, column );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleIndex()" );
}
@@ -152,7 +152,7 @@ table_wrapper_get_column_at_index (AtkTable *table,
if( pTable )
return pTable->getAccessibleColumn( nIndex );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleColumn()" );
}
@@ -177,7 +177,7 @@ table_wrapper_get_row_at_index( AtkTable *table,
if( pTable )
return pTable->getAccessibleRow( nIndex );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleRow()" );
}
@@ -201,7 +201,7 @@ table_wrapper_get_n_columns( AtkTable *table )
if( pTable )
return pTable->getAccessibleColumnCount();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleColumnCount()" );
}
@@ -225,7 +225,7 @@ table_wrapper_get_n_rows( AtkTable *table )
if( pTable )
return pTable->getAccessibleRowCount();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleRowCount()" );
}
@@ -251,7 +251,7 @@ table_wrapper_get_column_extent_at( AtkTable *table,
if( pTable )
return pTable->getAccessibleColumnExtentAt( row, column );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleColumnExtentAt()" );
}
@@ -277,7 +277,7 @@ table_wrapper_get_row_extent_at( AtkTable *table,
if( pTable )
return pTable->getAccessibleRowExtentAt( row, column );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleRowExtentAt()" );
}
@@ -301,7 +301,7 @@ table_wrapper_get_caption( AtkTable *table )
return atk_object_wrapper_conditional_ref( pTable->getAccessibleCaption() );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleCaption()" );
}
@@ -326,7 +326,7 @@ table_wrapper_get_row_description( AtkTable *table,
if( pTable )
return getAsConst( pTable->getAccessibleRowDescription( row ) );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleRowDescription()" );
}
@@ -351,7 +351,7 @@ table_wrapper_get_column_description( AtkTable *table,
if( pTable )
return getAsConst( pTable->getAccessibleColumnDescription( column ) );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleColumnDescription()" );
}
@@ -382,7 +382,7 @@ table_wrapper_get_row_header( AtkTable *table,
return atk_object_wrapper_conditional_ref( xRowHeaders->getAccessibleCellAt( row, 0 ) );
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleRowHeaders()" );
}
@@ -414,7 +414,7 @@ table_wrapper_get_column_header( AtkTable *table,
return atk_object_wrapper_conditional_ref( xColumnHeaders->getAccessibleCellAt( 0, column ) );
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleColumnHeaders()" );
}
@@ -439,7 +439,7 @@ table_wrapper_get_summary( AtkTable *table )
return atk_object_wrapper_conditional_ref( pTable->getAccessibleSummary() );
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleSummary()" );
}
@@ -480,7 +480,7 @@ table_wrapper_get_selected_columns( AtkTable *table,
if( pTable )
return convertToGIntArray( pTable->getSelectedAccessibleColumns(), pSelected );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getSelectedAccessibleColumns()" );
}
@@ -505,7 +505,7 @@ table_wrapper_get_selected_rows( AtkTable *table,
if( pTable )
return convertToGIntArray( pTable->getSelectedAccessibleRows(), pSelected );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getSelectedAccessibleRows()" );
}
@@ -530,7 +530,7 @@ table_wrapper_is_column_selected( AtkTable *table,
if( pTable )
return pTable->isAccessibleColumnSelected( column );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in isAccessibleColumnSelected()" );
}
@@ -555,7 +555,7 @@ table_wrapper_is_row_selected( AtkTable *table,
if( pTable )
return pTable->isAccessibleRowSelected( row );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in isAccessibleRowSelected()" );
}
@@ -581,7 +581,7 @@ table_wrapper_is_selected( AtkTable *table,
if( pTable )
return pTable->isAccessibleSelected( row, column );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in isAccessibleSelected()" );
}
commit fea392e1aae17851d5c0a657b287cdae07b8119b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 19:45:06 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: I7e2dbcf299fc01255340c78d99f0434dc0c1fc61
diff --git a/vcl/unx/gtk/a11y/atkselection.cxx b/vcl/unx/gtk/a11y/atkselection.cxx
index d0d63cf..8132118 100644
--- a/vcl/unx/gtk/a11y/atkselection.cxx
+++ b/vcl/unx/gtk/a11y/atkselection.cxx
@@ -59,7 +59,7 @@ selection_add_selection( AtkSelection *selection,
return TRUE;
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in selectAccessibleChild()" );
}
@@ -77,7 +77,7 @@ selection_clear_selection( AtkSelection *selection )
return TRUE;
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in selectAccessibleChild()" );
}
@@ -93,7 +93,7 @@ selection_ref_selection( AtkSelection *selection,
if( pSelection )
return atk_object_wrapper_ref( pSelection->getSelectedAccessibleChild( i ) );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getSelectedAccessibleChild()" );
}
@@ -108,7 +108,7 @@ selection_get_selection_count( AtkSelection *selection)
if( pSelection )
return pSelection->getSelectedAccessibleChildCount();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getSelectedAccessibleChildCount()" );
}
@@ -124,7 +124,7 @@ selection_is_child_selected( AtkSelection *selection,
if( pSelection )
return pSelection->isAccessibleChildSelected( i );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getSelectedAccessibleChildCount()" );
}
@@ -143,7 +143,7 @@ selection_remove_selection( AtkSelection *selection,
return TRUE;
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getSelectedAccessibleChildCount()" );
}
@@ -161,7 +161,7 @@ selection_select_all_selection( AtkSelection *selection)
return TRUE;
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getSelectedAccessibleChildCount()" );
}
commit 85dc973219c31a11e9a88cb86dcb813402084149
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 19:34:30 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: I4763547ceebab61077c67f2a8c67d6ab388fb6b3
diff --git a/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx
index d7a3852..864057d 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.cxx
@@ -63,7 +63,7 @@ hyper_link_get_uri( AtkHyperlink *pLink,
OUString aUri = aAny.get< OUString > ();
return OUStringToGChar(aUri);
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in hyper_link_get_uri" );
}
return NULL;
@@ -78,7 +78,7 @@ hyper_link_get_object( AtkHyperlink *pLink,
uno::Reference< accessibility::XAccessible > xObj( aAny, uno::UNO_QUERY_THROW );
return atk_object_wrapper_ref( xObj );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in hyper_link_get_object" );
}
return NULL;
@@ -89,7 +89,7 @@ hyper_link_get_end_index( AtkHyperlink *pLink )
try {
return getHyperlink( pLink )->getEndIndex();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
}
return -1;
}
@@ -99,7 +99,7 @@ hyper_link_get_start_index( AtkHyperlink *pLink )
try {
return getHyperlink( pLink )->getStartIndex();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
}
return -1;
}
@@ -109,7 +109,7 @@ hyper_link_is_valid( AtkHyperlink *pLink )
try {
return getHyperlink( pLink )->isValid();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
}
return FALSE;
}
@@ -119,7 +119,7 @@ hyper_link_get_n_anchors( AtkHyperlink *pLink )
try {
return getHyperlink( pLink )->getAccessibleActionCount();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
}
return 0;
}
@@ -230,7 +230,7 @@ hypertext_get_link( AtkHypertext *hypertext,
return ATK_HYPERLINK( pLink );
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getHyperLink()" );
}
@@ -245,7 +245,7 @@ hypertext_get_n_links( AtkHypertext *hypertext )
if( pHypertext )
return pHypertext->getHyperLinkCount();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getHyperLinkCount()" );
}
@@ -261,7 +261,7 @@ hypertext_get_link_index( AtkHypertext *hypertext,
if( pHypertext )
return pHypertext->getHyperLinkIndex( index );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getHyperLinkIndex()" );
}
commit 0fb6957f37214224a9a6d74db0edb68779b2a33b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 19:33:44 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: I58537f2fa2c0c403f441319b574b6f7794f38152
diff --git a/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx
index c58a54e..9a14c81 100644
--- a/vcl/unx/gtk/a11y/atkimage.cxx
+++ b/vcl/unx/gtk/a11y/atkimage.cxx
@@ -67,7 +67,7 @@ image_get_image_description( AtkImage *image )
if( pImage )
return getAsConst( pImage->getAccessibleImageDescription() );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleImageDescription()" );
}
@@ -102,7 +102,7 @@ image_get_image_size( AtkImage *image,
*height = pImage->getAccessibleImageHeight();
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleImageHeight() or Width" );
}
}
commit d4ea861f721360eb26e49d12bcc115439e784fd4
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 17:52:31 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: I697e70491fb77f61615b3d5780b57fff29a04ec6
diff --git a/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx
index 6e3bd38..8f18b49 100644
--- a/vcl/unx/gtk/a11y/atkcomponent.cxx
+++ b/vcl/unx/gtk/a11y/atkcomponent.cxx
@@ -81,7 +81,7 @@ component_wrapper_grab_focus (AtkComponent *component)
return TRUE;
}
}
- catch( const uno::Exception &e )
+ catch( const uno::Exception & )
{
g_warning( "Exception in grabFocus()" );
}
@@ -103,7 +103,7 @@ component_wrapper_contains (AtkComponent *component,
if( pComponent )
return pComponent->containsPoint( translatePoint( pComponent, x, y, coord_type ) );
}
- catch( const uno::Exception &e )
+ catch( const uno::Exception & )
{
g_warning( "Exception in containsPoint()" );
}
@@ -147,7 +147,7 @@ component_wrapper_ref_accessible_at_point (AtkComponent *component,
return atk_object_wrapper_ref( xAccessible );
}
}
- catch( const uno::Exception &e )
+ catch( const uno::Exception & )
{
g_warning( "Exception in getAccessibleAtPoint()" );
}
@@ -183,7 +183,7 @@ component_wrapper_get_position (AtkComponent *component,
#endif
}
}
- catch( const uno::Exception &e )
+ catch( const uno::Exception & )
{
g_warning( "Exception in getLocation[OnScreen]()" );
}
@@ -210,7 +210,7 @@ component_wrapper_get_size (AtkComponent *component,
#endif
}
}
- catch( const uno::Exception &e )
+ catch( const uno::Exception & )
{
g_warning( "Exception in getSize()" );
}
commit b76187aac7787877f6e2caa0f96fdba9bf26ea48
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 17:51:59 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: Ibd913043822c9901bad8495944367915df10b1f4
diff --git a/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx
index 7f1d5bd..ed0675e 100644
--- a/vcl/unx/gtk/a11y/atkeditabletext.cxx
+++ b/vcl/unx/gtk/a11y/atkeditabletext.cxx
@@ -69,7 +69,7 @@ editable_text_wrapper_set_run_attributes( AtkEditableText *text,
return pEditableText->setAttributes(nStartOffset, nEndOffset, aAttributeList);
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in setAttributes()" );
}
@@ -88,7 +88,7 @@ editable_text_wrapper_set_text_contents( AtkEditableText *text,
pEditableText->setText( aString );
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in setText()" );
}
}
@@ -108,7 +108,7 @@ editable_text_wrapper_insert_text( AtkEditableText *text,
*pos += length;
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in insertText()" );
}
}
@@ -123,7 +123,7 @@ editable_text_wrapper_cut_text( AtkEditableText *text,
if( pEditableText )
pEditableText->cutText( start, end );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in cutText()" );
}
}
@@ -138,7 +138,7 @@ editable_text_wrapper_delete_text( AtkEditableText *text,
if( pEditableText )
pEditableText->deleteText( start, end );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in deleteText()" );
}
}
@@ -152,7 +152,7 @@ editable_text_wrapper_paste_text( AtkEditableText *text,
if( pEditableText )
pEditableText->pasteText( pos );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in pasteText()" );
}
}
@@ -167,7 +167,7 @@ editable_text_wrapper_copy_text( AtkEditableText *text,
if( pEditableText )
pEditableText->copyText( start, end );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in copyText()" );
}
}
commit eecfc1e2a4287fcd93a19bbc5876a0bc1ada7822
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 16:37:34 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: Ibcf69aee2391b830c328f458ba2ab753a4e18b9d
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 3dbce85..11f315f 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.cxx
@@ -77,7 +77,7 @@ action_wrapper_do_action (AtkAction *action,
if( pAction )
return pAction->doAccessibleAction( i );
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in doAccessibleAction()" );
}
@@ -92,7 +92,7 @@ action_wrapper_get_n_actions (AtkAction *action)
if( pAction )
return pAction->getAccessibleActionCount();
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleActionCount()" );
}
@@ -150,7 +150,7 @@ action_wrapper_get_name (AtkAction *action,
return aNewVal.second;
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in getAccessibleActionDescription()" );
}
@@ -238,7 +238,7 @@ action_wrapper_get_keybinding (AtkAction *action,
}
}
}
- catch(const uno::Exception& e) {
+ catch(const uno::Exception&) {
g_warning( "Exception in get_keybinding()" );
}
commit 6ed352a7b35fd2f740fe76cc56b0b255b6ceae17
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 16:24:06 2013 +0100
-Werror,-Wunused-exception-parameter
Change-Id: I648399356bed41f6aa9d6ec276ee975f5d3b1fa4
diff --git a/ucb/source/ucp/gio/gio_inputstream.cxx b/ucb/source/ucp/gio/gio_inputstream.cxx
index e9ce34f..82d7aa0 100644
--- a/ucb/source/ucp/gio/gio_inputstream.cxx
+++ b/ucb/source/ucp/gio/gio_inputstream.cxx
@@ -80,7 +80,7 @@ sal_Int32 SAL_CALL InputStream::readBytes( uno::Sequence< sal_Int8 >& aData, sal
{
aData.realloc( nBytesToRead );
}
- catch ( const uno::Exception &e )
+ catch ( const uno::Exception & )
{
throw io::BufferSizeExceededException();
}
commit 6e349393768cd8141daf3b9dd663e6a9ad8e8ca0
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 16:14:53 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I51dff2bbfe8b9fb36080cb3fe20bfdd6b0e88119
diff --git a/sw/source/filter/ww8/styles.cxx b/sw/source/filter/ww8/styles.cxx
index b3c58e2..c2588cb 100644
--- a/sw/source/filter/ww8/styles.cxx
+++ b/sw/source/filter/ww8/styles.cxx
@@ -27,16 +27,6 @@
namespace
{
- class SameName: public std::unary_function<const sal_Char*, bool>
- {
- private:
- const OUString &mrName;
- public:
- explicit SameName(const OUString &rName) : mrName(rName) {}
- bool operator() (const sal_Char *pEntry) const
- { return mrName.equalsAscii(pEntry); }
- };
-
const sal_Char **GetStiNames() throw()
{
static const sal_Char *stiName[] =
commit 8fd81bd96b0caf0b52eab69e64d0901e8e29f933
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 15:57:41 2013 +0100
-Werror,-Wunused-member-function
Change-Id: Ic575f5bcca894639667f9893c5caf8163b124037
diff --git a/sw/source/core/docnode/nodedump.cxx b/sw/source/core/docnode/nodedump.cxx
index 482aac8..da8f4b2 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -38,7 +38,6 @@ public:
WriterHelper( xmlTextWriterPtr );
~WriterHelper();
operator xmlTextWriterPtr();
- xmlTextWriterPtr operator->();
void startElement( const char* element );
void endElement();
void writeFormatAttribute( const char* attribute, const char* format, ... )
@@ -77,11 +76,6 @@ WriterHelper::operator xmlTextWriterPtr()
return writer;
}
-xmlTextWriterPtr WriterHelper::operator->()
-{
- return writer;
-}
-
void WriterHelper::startElement( const char* element )
{
xmlTextWriterStartElement( writer, BAD_CAST( element ));
commit 1a13c2793daae26f7c0abb0fb93ae6ca812b4518
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 15:54:26 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I67ed29e0669ab189f158aca4c6f0dd95fac3ea1a
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index ad9426a..554e3ae 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -934,11 +934,6 @@ namespace
public:
_SwSaveTypeCountContent() { TYPECOUNT.nTypeCount = 0; nContent = 0; }
- _SwSaveTypeCountContent( sal_uInt16 nType )
- {
- SetTypeAndCount( nType, 0 );
- nContent = 0;
- }
_SwSaveTypeCountContent( const std::vector<sal_uLong> &rArr, sal_uInt16& rPos )
{
TYPECOUNT.nTypeCount = rArr[ rPos++ ];
commit c10b8c2f06a9403da7d107cdd32ad4a535e6f339
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 15:49:23 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I3da2e9d7e886c73328b65275e938bcbe9b3661cc
diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx
index 3155738..5898f91 100644
--- a/slideshow/source/engine/usereventqueue.cxx
+++ b/slideshow/source/engine/usereventqueue.cxx
@@ -121,11 +121,6 @@ public:
maEvents.push( rEvent );
}
- bool isEmpty()
- {
- return maEvents.empty();
- }
-
protected:
ImpEventQueue maEvents;
};
commit 5ccb60089061f3af9ffc7c37bbb0ea75231cdbe3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 15:47:21 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I8321893bc64e1fe401ffd5acaaa52e012c374261
diff --git a/slideshow/source/engine/tools.cxx b/slideshow/source/engine/tools.cxx
index fac4bed6..5cebace 100644
--- a/slideshow/source/engine/tools.cxx
+++ b/slideshow/source/engine/tools.cxx
@@ -58,23 +58,6 @@ namespace slideshow
{
namespace
{
- class NamedValueStringComparator
- {
- public:
- NamedValueStringComparator( const OUString& rSearchString ) :
- mrSearchString( rSearchString )
- {
- }
-
- bool operator()( const beans::NamedValue& rValue ) const
- {
- return rValue.Name == mrSearchString;
- }
-
- private:
- const OUString& mrSearchString;
- };
-
class NamedValueComparator
{
public:
commit a6ba5addb7d37d55706518180841332642cf8eae
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 15:45:40 2013 +0100
-Werror,-Wunused-member-function
Change-Id: Iefe2c50a8fbd6ab95a77856b3a65de9e6beacefe
diff --git a/slideshow/source/engine/slideview.cxx b/slideshow/source/engine/slideview.cxx
index 2d2c421..5db492d 100644
--- a/slideshow/source/engine/slideview.cxx
+++ b/slideshow/source/engine/slideview.cxx
@@ -27,7 +27,6 @@
#include "delayevent.hxx"
#include "unoview.hxx"
-#include <rtl/instance.hxx>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase2.hxx>
#include <cppuhelper/implementationentry.hxx>
@@ -70,14 +69,6 @@ namespace internal {
namespace {
-struct StaticUnitRectPoly : public rtl::StaticWithInit<basegfx::B2DPolygon, StaticUnitRectPoly>
-{
- basegfx::B2DPolygon operator()()
- {
- return basegfx::tools::createUnitPolygon();
- }
-};
-
/** Sprite entry, to store sprite plus priority
The operator<() defines a strict weak ordering of sprites, sort
commit ad4268cc8ae58d4c65ae343876b325d9db720c73
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 15:43:32 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I91827c3728d56b8943e9769e3fefdcc727306e16
diff --git a/slideshow/source/engine/shapes/drawinglayeranimation.cxx b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
index 044e81c..b5f36fb 100644
--- a/slideshow/source/engine/shapes/drawinglayeranimation.cxx
+++ b/slideshow/source/engine/shapes/drawinglayeranimation.cxx
@@ -85,10 +85,8 @@ public:
mbAlternate(bAlternate)
{}
- sal_uInt32 GetDuration() const { return mnDuration; }
sal_uInt32 GetRepeat() const { return mnRepeat; }
sal_uInt32 GetFullTime() const { return mnDuration * mnRepeat; }
- double GetStart() const { return mfStart; }
double GetStop() const { return mfStop; }
sal_uInt32 GetFrequency() const { return mnFrequency; }
bool DoAlternate() const { return mbAlternate; }
commit 90be5b23e62cbdd6c93d5703c29507e4ce463bac
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 15:01:41 2013 +0100
-Werror,-Wshift-sign-overflow
Change-Id: Ie6843c4d455dd82a8c1ebd8778165b04e7b94d71
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 18cdd31..234f87c 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -311,7 +311,7 @@ PowerPointExport::PowerPointExport( const Reference< XComponentContext > & rxCtx
PPTWriterBase(),
mnLayoutFileIdMax( 1 ),
mnSlideIdMax( 1 << 8 ),
- mnSlideMasterIdMax( 1 << 31 ),
+ mnSlideMasterIdMax( 1U << 31 ),
mnAnimationNodeIdMax( 1 )
{
memset( mLayoutInfo, 0, sizeof(mLayoutInfo) );
commit 6316de5b705623a01ab3af926dad2ef7e17dd55b
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 15:00:15 2013 +0100
-Werror,-Wshift-sign-overflow
Change-Id: I4940e801aeebc5e8457e17ca8cdb50d5301a5218
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 97823aa..064b120 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1202,7 +1202,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
}
sal_uInt32 nHyperId(0);
if ( !aPageUrl.isEmpty() )
- nHyperId = ImplInsertBookmarkURL( aPageUrl, 1 | ( nPageIndex << 8 ) | ( 1 << 31 ), pFieldEntry->aRepresentation, "", "", aPageUrl );
+ nHyperId = ImplInsertBookmarkURL( aPageUrl, 1 | ( nPageIndex << 8 ) | ( 1U << 31 ), pFieldEntry->aRepresentation, "", "", aPageUrl );
else
nHyperId = ImplInsertBookmarkURL( pFieldEntry->aFieldUrl, 2 | ( nHyperId << 8 ), aFile, aTarget, "", "" );
@@ -2038,7 +2038,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
aHyperString += OUString::number(nIndex + 1);
aHyperString += ",Slide ";
aHyperString += OUString::number(nIndex + 1);
- nHyperLinkID = ImplInsertBookmarkURL( aHyperString, 1 | ( nIndex << 8 ) | ( 1 << 31 ), aBookmark, "", "", aHyperString );
+ nHyperLinkID = ImplInsertBookmarkURL( aHyperString, 1 | ( nIndex << 8 ) | ( 1U << 31 ), aBookmark, "", "", aHyperString );
}
}
}
@@ -2059,7 +2059,7 @@ void PPTWriter::ImplWriteClickAction( SvStream& rSt, ::com::sun::star::presentat
INetURLObject aUrl( aBookmark );
if ( INET_PROT_FILE == aUrl.GetProtocol() )
aBookmarkFile = aUrl.PathToFileName();
- nHyperLinkID = ImplInsertBookmarkURL( aBookmark, (sal_uInt32)(2 | ( 1 << 31 )), aBookmarkFile, aBookmark, "", "" );
+ nHyperLinkID = ImplInsertBookmarkURL( aBookmark, (sal_uInt32)(2 | ( 1U << 31 )), aBookmarkFile, aBookmark, "", "" );
}
}
}
commit 13e4f86a51e26b89a22c4c6412c113f475392619
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 14:57:46 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I69caf8ce9395c6318f1452e5bed3752e1c282528
diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx
index 1130ba7..536a7fa 100644
--- a/slideshow/source/engine/expressionnodefactory.cxx
+++ b/slideshow/source/engine/expressionnodefactory.cxx
@@ -167,21 +167,6 @@ namespace slideshow
}
};
- class ComposedExpression : public BinaryExpressionBase
- {
- public:
- ComposedExpression( const ExpressionNodeSharedPtr& rFirstArg,
- const ExpressionNodeSharedPtr& rSecondArg ) :
- BinaryExpressionBase( rFirstArg, rSecondArg )
- {
- }
-
- virtual double operator()( double t ) const
- {
- return (*mpFirstArg)( (*mpSecondArg)(t) );
- }
- };
-
class MinExpression : public BinaryExpressionBase
{
public:
commit 304e9c4c3734d7f0f4b62d221a9c70908b6d746d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 14:53:58 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I7db34329a93c33c425f1e63fa842b218e4c9517c
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index ceac0ac..4136e89d8 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -233,23 +233,6 @@ namespace {
}
/** Return <TRUE/> when the value of the property with name pName is
- a string and its value equals pValue. When the property is
- unknown then bDefaultValue is returned. Otherwise <FALSE/> is
- returned.
- */
- bool GetBoolValue (
- const sal_Char* pName,
- const sal_Char* pValue,
- const bool bDefaultValue = false) const
- {
- OUString sValue( mrProperties.getStringValue( pName ) );
- if (!sValue.isEmpty())
- return sValue.equalsAscii(pValue);
- else
- return bDefaultValue;
- }
-
- /** Return <TRUE/> when the value of the property with name pName is
an integer and its value is nTriggerValue. Otherwise <FALSE/> is
returned.
*/
commit 8edf036c33c2eccddefded42ad1e64fae96c7539
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 14:48:36 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I0e7bde090d68f840b4dee0fa27a7dfaf05a21e8a
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
index 7f9af76..77d1ad1 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx
@@ -63,8 +63,6 @@ private:
*/
inline void AdvanceToNextValidElement (void);
- // Default constructor not implemented.
- PageEnumerationImpl (void);
// Assignment operator not implemented.
PageEnumerationImpl& operator= (const PageEnumerationImpl&);
};
commit a6f46da9651c972ae7f9d3cc78764bd0b24e5def
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 14:48:14 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I24a86c070d14e151d7fd893e17ccf10cd1b4e6e1
diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
index 2ce8c83..46eb6bd 100644
--- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
+++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx
@@ -50,16 +50,6 @@ using namespace ::com::sun::star::uno;
namespace sd { namespace slidesorter { namespace model {
namespace {
- class CompareToXDrawPage
- {
- public:
- CompareToXDrawPage (const Reference<drawing::XDrawPage>& rxSlide) : mxSlide(rxSlide) {}
- bool operator() (const SharedPageDescriptor& rpDescriptor)
- { return rpDescriptor.get()!=NULL && rpDescriptor->GetXDrawPage()==mxSlide; }
- private:
- Reference<drawing::XDrawPage> mxSlide;
- };
-
bool PrintModel (const SlideSorterModel& rModel)
{
for (sal_Int32 nIndex=0,nCount=rModel.GetPageCount(); nIndex<nCount; ++nIndex)
commit b4ac2870360ec83aa941bd3627e5b39cb1292181
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 14:44:45 2013 +0100
-Werror,-Wunused-member-function
Change-Id: Id6e605546453a45124acf23cda90fe8a9031f580
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
index 0c0941d..e10d816 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx
@@ -52,8 +52,6 @@ namespace sd { namespace slidesorter { namespace model {
class PageDescriptor;
} } }
-namespace { class NavigatorDropEvent; }
-
namespace sd { namespace slidesorter { namespace controller {
class SlideSorterController;
@@ -229,8 +227,6 @@ private:
nDropAction, disguised as void*.
*/
DECL_LINK(ProcessDragFinished, void*);
-
- DECL_LINK(ExecuteNavigatorDrop, NavigatorDropEvent*);
};
} } } // end of namespace ::sd::slidesorter::controller
commit b8111a0012292f80562382fedd2c25b56a2f608e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 14:13:00 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I52a2cb0a472b2b5d4489121a456f744c6be19b64
diff --git a/sc/source/filter/orcus/interface.cxx b/sc/source/filter/orcus/interface.cxx
index 86964ea..cd1ad91 100644
--- a/sc/source/filter/orcus/interface.cxx
+++ b/sc/source/filter/orcus/interface.cxx
@@ -267,55 +267,6 @@ formula::FormulaGrammar::Grammar getCalcGrammarFromOrcus( os::formula_grammar_t
return eGrammar;
}
-class SharedFormulaGroups
-{
- struct Key
- {
- sal_Int32 mnId;
- sal_Int32 mnCol;
-
- Key(sal_Int32 nId, sal_Int32 nCol) : mnId(nId), mnCol(nCol) {}
-
- bool operator== ( const Key& rOther ) const
- {
- return mnId == rOther.mnId && mnCol == rOther.mnCol;
- }
-
- bool operator!= ( const Key& rOther ) const
- {
- return !operator==(rOther);
- }
- };
-
- struct KeyHash
- {
- size_t operator() ( const Key& rKey ) const
- {
- double nVal = rKey.mnId;
- nVal *= 256.0;
- nVal += rKey.mnCol;
- return static_cast<size_t>(nVal);
- }
- };
-
- typedef boost::unordered_map<Key, ScFormulaCellGroupRef, KeyHash> StoreType;
- StoreType maStore;
-public:
-
- void set( sal_Int32 nSharedId, sal_Int32 nCol, const ScFormulaCellGroupRef& xGroup )
- {
- Key aKey(nSharedId, nCol);
- maStore.insert(StoreType::value_type(aKey, xGroup));
- }
-
- ScFormulaCellGroupRef get( sal_Int32 nSharedId, sal_Int32 nCol ) const
- {
- Key aKey(nSharedId, nCol);
- StoreType::const_iterator it = maStore.find(aKey);
- return it == maStore.end() ? ScFormulaCellGroupRef() : it->second;
- }
-};
-
}
void ScOrcusSheet::set_formula(
commit a2fcb3869308a6d4963fe13c5e598fe8aa6420ae
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 14:09:20 2013 +0100
-Werror,-Wunused-member-function
Change-Id: Ib0974dcfa02a151ed970334e56c596e9c3343ca6
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index b9ae6b1..343c545 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -54,8 +54,6 @@ public:
ScFormulaCell* mpCell;
Item() : mnRow(-1), mpCell(NULL) {}
- Item( SCROW nRow, ScFormulaCell* pCell ) :
- mnRow(nRow), mpCell(pCell) {}
};
CachedTokenArray( ScDocument& rDoc ) : mrDoc(rDoc) {}
commit 0d61e8250baec8c59e0036290ce56c885668a152
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 14:08:11 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I41ee628a7becb940fe19f3f17640ce4976df870e
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 2b6f271..8231640 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -1869,8 +1869,6 @@ class NumberFormatFinalizer
public:
explicit NumberFormatFinalizer( const WorkbookHelper& rHelper );
- inline bool is() const { return mxNumFmts.is(); }
-
inline void operator()( NumberFormat& rNumFmt ) const
{ rNumFmt.finalizeImport( mxNumFmts, maEnUsLocale ); }
commit 2a6a3384ac3414f200fcbde507d6458f2c70f83d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 13:01:54 2013 +0100
-Werror,-Wunused-member-function
Change-Id: Id1a974507f73193aa788523cebc75abd9fc684c5
diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
index aa696b3..315c5f1 100644
--- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
+++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx
@@ -67,11 +67,6 @@ public:
OUString msURL;
OUString msName;
::sd::sidebar::MasterPageContainer::Token maToken;
- Descriptor (const OUString& rsURL, const OUString& rsName)
- : msURL(rsURL),
- msName(rsName),
- maToken(::sd::sidebar::MasterPageContainer::NIL_TOKEN)
- {}
Descriptor (::sd::sidebar::MasterPageContainer::Token aToken,
const OUString& rsURL, const OUString& rsName)
: msURL(rsURL),
commit 9e50349c54edc6563770a7f25244f517e572f8b3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 13:00:31 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I65ce35a10ea2ac406b9f42a47bd9f5619e136d96
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 0090776..f2680b2 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -164,6 +164,29 @@ private:
namespace sd { namespace framework {
+namespace {
+
+ class FrameworkHelperAllPassFilter
+ {
+ public:
+ bool operator() (const cssdf::ConfigurationChangeEvent&) { return true; }
+ };
+
+
+ class FrameworkHelperResourceIdFilter
+ {
+ public:
+ FrameworkHelperResourceIdFilter (
+ const cssu::Reference<cssdf::XResourceId>& rxResourceId);
+ bool operator() (const cssdf::ConfigurationChangeEvent& rEvent)
+ { return mxResourceId.is() && rEvent.ResourceId.is()
+ && mxResourceId->compareTo(rEvent.ResourceId) == 0; }
+ private:
+ cssu::Reference<cssdf::XResourceId> mxResourceId;
+ };
+
+} // end of anonymous namespace
+
// Pane URLS.
const OUString FrameworkHelper::msPaneURLPrefix("private:resource/pane/");
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 301238e..437e694 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -359,39 +359,6 @@ private:
} } // end of namespace sd::framework
-
-
-namespace sd { namespace framework {
-
-namespace {
-
- class FrameworkHelperAllPassFilter
- {
- public:
- bool operator() (const cssdf::ConfigurationChangeEvent&) { return true; }
- };
-
-
- class FrameworkHelperResourceIdFilter
- {
- public:
- FrameworkHelperResourceIdFilter (
- const cssu::Reference<cssdf::XResourceId>& rxResourceId);
- bool operator() (const cssdf::ConfigurationChangeEvent& rEvent)
- { return mxResourceId.is() && rEvent.ResourceId.is()
- && mxResourceId->compareTo(rEvent.ResourceId) == 0; }
- private:
- cssu::Reference<cssdf::XResourceId> mxResourceId;
- };
-
-} // end of anonymous namespace
-
-
-
-
-} } // end of namespace sd::framework
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 1097b97c36e91a16db47dfbb7d54a0317e07d57c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 11:57:13 2013 +0100
-Werror,-Wunused-member-function
Change-Id: Icd677dcdbc1748da2fcd1dc37db9c4885f505ac9
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 8ebcf4f..1a3afd1 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -472,9 +472,6 @@ public:
mbRowHeaders = bRowHeaders;
}
- bool hasColHeaders() const { return mbColHeaders; }
- bool hasRowHeaders() const { return mbRowHeaders; }
-
Chart2PositionMap* getPositionMap()
{
createPositionMap();
@@ -482,8 +479,6 @@ public:
}
private:
- Chart2Positioner(); // disabled
-
void invalidateGlue();
void glueState();
void calcGlueState(SCCOL nCols, SCROW nRows);
@@ -880,9 +875,6 @@ public:
}
private:
- Tokens2RangeString(); // disabled
-
-private:
shared_ptr<OUStringBuffer> mpRangeStr;
ScDocument* mpDoc;
FormulaGrammar::Grammar meGrammar;
@@ -952,8 +944,6 @@ public:
}
private:
- Tokens2RangeStringXML(); // disabled
-
bool splitRangeToken(const ScTokenRef& pToken, ScTokenRef& rStart, ScTokenRef& rEnd) const
{
ScComplexRefData aData;
@@ -3193,8 +3183,6 @@ public:
Sequence<OUString> getLabels() const { return *mpLabels; }
private:
- GenerateLabelStrings(); // disabled
-
shared_ptr< Sequence<OUString> > mpLabels;
chart2::data::LabelOrigin meOrigin;
sal_Int32 mnCount;
commit 4105d5f2cb6ce1111b41a7df29a12cbf5e3f1f34
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 11:30:57 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I76caaa7e6097fc17d6eb5098b890e755e4d6e3aa
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 0999c04..0320be5 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -3086,37 +3086,6 @@ void ScXMLImport::SetLabelRanges()
namespace {
-/**
- * Used to switch off document modify and broadcast while populating named
- * ranges during import.
- */
-class NamedRangesSwitch
-{
-public:
- NamedRangesSwitch(Reference<beans::XPropertySet>& xPropSet) :
- mxPropSet(xPropSet), maPropName(SC_UNO_MODIFY_BROADCAST)
- {
- uno::Any any;
- any <<= false;
- mxPropSet->setPropertyValue(maPropName, any);
- }
-
- ~NamedRangesSwitch()
- {
- uno::Any any;
- any <<= sal_True;
- mxPropSet->setPropertyValue(maPropName, any);
- }
-
-private:
- Reference<beans::XPropertySet>& mxPropSet;
- OUString maPropName;
-};
-
-}
-
-namespace {
-
class RangeNameInserter : public ::std::unary_function<ScMyNamedExpression, void>
{
ScDocument* mpDoc;
commit 4f8c687097488d9d8cab901451fff3053e9ae403
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 11:30:32 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I2e247ed311f6b3fee751900b8f037081d0025794
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 2067f19..4b611d7 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -603,37 +603,6 @@ sal_Int32 ScXMLExport::GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const
return itr->second;
}
-namespace {
-
-/**
- * Update the progress bar state when an instance of this class goes out of
- * scope.
- */
-class ProgressBarUpdater
-{
- ProgressBarHelper& mrHelper;
- const sal_Int32& mrTableCount;
- const sal_Int32& mrShapesCount;
- const sal_Int32 mnCellCount;
-public:
- ProgressBarUpdater(ProgressBarHelper& rHelper,
- const sal_Int32& rTableCount, const sal_Int32& rShapesCount,
- const sal_Int32 nCellCount) :
- mrHelper(rHelper),
- mrTableCount(rTableCount),
- mrShapesCount(rShapesCount),
- mnCellCount(nCellCount) {}
-
- ~ProgressBarUpdater()
- {
- sal_Int32 nRef = mnCellCount + (2 * mrTableCount) + (2 * mrShapesCount);
- mrHelper.SetReference(nRef);
- mrHelper.SetValue(0);
- }
-};
-
-}
-
void ScXMLExport::CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount)
{
if (!GetModel().is())
commit 9e30ced3c372c01b4a2bfb10abc42fd77f9a0fdf
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 11:20:13 2013 +0100
-Werror,-Wunused-member-function
Change-Id: Idbc13f395b8e23e876d0e954810f3a91b2399748
diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx
index c1e2865..6130c61 100644
--- a/sc/source/core/tool/rangenam.cxx
+++ b/sc/source/core/tool/rangenam.cxx
@@ -670,17 +670,6 @@ public:
}
};
-class MatchByIndex : public unary_function<ScRangeData, bool>
-{
- sal_uInt16 mnIndex;
-public:
- MatchByIndex(sal_uInt16 nIndex) : mnIndex(nIndex) {}
- bool operator() (const ScRangeData& r) const
- {
- return mnIndex == r.GetIndex();
- }
-};
-
}
ScRangeName::ScRangeName() {}
commit 1eab4c942a73e0d5b2afc06e5b49023673ce6d12
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 11:19:58 2013 +0100
-Werror,-Wunused-member-function
Change-Id: Ie10ff4da2612e4b89d9126070edeeb0b5661df86
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index c110566..775e8e6 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -148,29 +148,6 @@ private:
bool mbFirst;
};
-class FindDeletedRange : public ::std::unary_function<const ScRange*, bool>
-{
-public:
- FindDeletedRange( SCsCOL nDx, SCsROW nDy): mnDx(nDx), mnDy(nDy) {}
- FindDeletedRange( const FindDeletedRange& r) : mnDx(r.mnDx), mnDy(r.mnDy) {}
- bool operator() (const ScRange* p)
- {
- const ScAddress& rStart = p->aStart;
- const ScAddress& rEnd = p->aEnd;
-
- if( rEnd.Col() +mnDx < rStart.Col() )
- return true;
- if( rEnd.Row() + mnDy < rStart.Row() )
- return true;
-
- return false;
- }
-
-private:
- SCsCOL mnDx;
- SCsROW mnDy;
-};
-
}
// ScRangeList
commit 4d8af503b633e5f0f340d49e25de431344271525
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 11:12:43 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I5e7898dc8b0f01cfae48ac564fc8157931a06f9f
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index f9e4bd3..47ad103 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -540,15 +540,12 @@ public:
SCCOL Col() const { return mrCalcPos.Col(); }
SCROW Row() const { return mrCalcPos.Row(); }
- const ScAddress& Pos() const { return mrCalcPos; }
-
void setTab(SCTAB nTab) { mrCalcPos.SetTab(nTab); }
void setCol(SCCOL nCol) { mrCalcPos.SetCol(nCol); }
void setRow(SCROW nRow) { mrCalcPos.SetRow(nRow); }
void incTab(SCTAB nInc=1) { mrCalcPos.IncTab(nInc); }
void incCol(SCCOL nInc=1) { mrCalcPos.IncCol(nInc); }
- void incRow(SCROW nInc=1) { mrCalcPos.IncRow(nInc); }
void setOldMapMode(const MapMode& rOldMapMode) { maOldMapMode = rOldMapMode; }
commit b383ddc28a52a3d1ede86ceb1b583d364752ee32
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 11:08:54 2013 +0100
-Werror,-Wunused-member-function
Change-Id: I89170a2d79605f72e40d5e7664458cad9590ec0b
diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx
index 0b7f0c3..a8f4d91 100644
--- a/sc/source/core/data/column.cxx
+++ b/sc/source/core/data/column.cxx
@@ -1273,36 +1273,6 @@ class CopyToClipHandler
maDestPos.miCellTextAttrPos, nRow, aAttrs.begin(), aAttrs.end());
}
- void groupFormulaCells(std::vector<ScFormulaCell*>& rCells)
- {
- if (rCells.empty())
- return;
-
- std::vector<ScFormulaCell*>::iterator it = rCells.begin(), itEnd = rCells.end();
- ScFormulaCell* pPrev = *it;
- ScFormulaCell* pCur = NULL;
- for (++it; it != itEnd; ++it, pPrev = pCur)
- {
- pCur = *it;
- ScFormulaCell::CompareState eState = pPrev->CompareByTokenArray(*pCur);
- if (eState == ScFormulaCell::NotEqual)
- continue;
-
- ScFormulaCellGroupRef xGroup = pPrev->GetCellGroup();
- if (xGroup)
- {
- // Extend the group.
- ++xGroup->mnLength;
- pCur->SetCellGroup(xGroup);
- continue;
- }
-
- // Create a new group.
- xGroup = pPrev->CreateCellGroup(pPrev->aPos.Row(), 2, eState == ScFormulaCell::EqualInvariant);
- pCur->SetCellGroup(xGroup);
- }
- }
-
void duplicateNotes(SCROW nStartRow, size_t nDataSize )
{
mrSrcCol.DuplicateNotes(nStartRow, nDataSize, mrDestCol, maDestPos);
commit 2586f7a6ddd195ce5ad21d91e2cf427cb229051d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 11:04:05 2013 +0100
-Werror,-Wunused-member-function
Change-Id: Iabe3b1dac4c3f0997e786cb641faf43e791018b1
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 4715b48..fbd0fbf 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -3305,21 +3305,6 @@ public:
update(fVal, bVal);
}
-
- void operator() (mdds::mtv::element_t eType, size_t nTopRow, size_t nDataSize)
- {
- if (eType == sc::element_type_empty)
- return;
-
- for (size_t i = 0; i < nDataSize; ++i)
- {
- size_t nRow = nTopRow + i;
- if (mrHiddenRows.getValue(nRow))
- continue;
-
- update(0.0, false);
- }
- }
};
}
commit 83b86f20c0a85dede9be8224c2be64b50377f46d
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 10:46:30 2013 +0100
-Werror,-Wduplicate-enum
Change-Id: I7ee0dee0ac35b9a678c76b8ebcb43c8ce5531709
diff --git a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
index cecc03e..4fc28c8 100644
--- a/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
+++ b/lotuswordpro/source/filter/lwpsdwdrawheader.hxx
@@ -70,7 +70,8 @@ const double THRESHOLD = 0.0001;
enum DrawObjectType
{
- OT_UNDEFINED,
+ OT_UNDEFINED = 0,
+
OT_SELECT = 0,
OT_HAND = 1,
OT_LINE = 2,
commit e537c807fbfbcbfb707c6bb49da2dcc5ea839920
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 10:42:09 2013 +0100
-Werror,-Wunused-member-function
SimpleView had been unused since its inception in
b561e658ebed8cfcfd18dc90bd25de9134341fb3 "INTEGRATION: CWS presenterview."
Change-Id: Ieb3af55c4cfebd24fe229c847f38ca108ae3401e
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 1e24207..f3315ba 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -57,30 +57,8 @@ const OUString PresenterViewFactory::msSlideSorterURL(
const OUString PresenterViewFactory::msHelpViewURL(
"private:resource/view/Presenter/Help");
-//===== SimpleView ============================================================
-
namespace {
-typedef ::cppu::WeakComponentImplHelper1 <XView> SimpleViewInterfaceBase;
-
-class SimpleView
- : private ::cppu::BaseMutex,
- public SimpleViewInterfaceBase
-{
-public:
- SimpleView (const Reference<XResourceId>& rxViewId)
- : SimpleViewInterfaceBase(m_aMutex),mxResourceId(rxViewId) {};
- virtual ~SimpleView (void) {};
-
- // XView
-
- virtual Reference<XResourceId> SAL_CALL getResourceId (void) throw (RuntimeException)
- { return mxResourceId; };
-
-private:
- Reference<XResourceId> mxResourceId;
-};
-
/** By default the PresenterSlidePreview shows the preview of the current
slide. This adapter class makes it display the preview of the next
slide.
commit ba3783467c400eac564bd61ce790f5f6fe8203b6
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 10:38:25 2013 +0100
-Werror,-Wunused-member-function
Change-Id: Ia04390e5a3d4c5833c24add581985a9491af0443
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 47e1a57..99d2421 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -56,148 +56,6 @@ Convert::Convert()
namespace
{
- // ========================================================================
- struct StringToken
- {
- private:
- OUString m_sString;
- sal_Int32 m_nTokenStart;
- sal_Int32 m_nTokenEnd;
-
- public:
- StringToken() : m_sString(), m_nTokenStart( 0 ), m_nTokenEnd( 0 ) { }
- StringToken( const OUString& _rString, sal_Int32 _nTokenStart, sal_Int32 _nTokenEnd );
- StringToken( const StringToken& );
- StringToken& operator=( const StringToken& );
-
- inline bool isEmpty() const { return m_nTokenEnd <= m_nTokenStart; }
- inline sal_Int32 getLength() const { return isEmpty() ? 0 : m_nTokenEnd - m_nTokenStart - 1; }
- inline const sal_Unicode* begin() const { return m_sString.getStr() + m_nTokenStart; }
- inline const sal_Unicode* end() const { return m_sString.getStr() + m_nTokenEnd; }
-
- bool toInt32( sal_Int32& _rValue ) const;
- };
-
- // ------------------------------------------------------------------------
- StringToken::StringToken( const OUString& _rString, sal_Int32 _nTokenStart, sal_Int32 _nTokenEnd )
- :m_sString( _rString )
- ,m_nTokenStart( _nTokenStart )
- ,m_nTokenEnd( _nTokenEnd )
- {
- OSL_ENSURE( ( m_nTokenStart >= 0 ) && ( m_nTokenStart <= m_sString.getLength() ), "StringToken::StringToken: invalid token start!" );
- OSL_ENSURE( ( m_nTokenEnd >= 0 ) && ( m_nTokenEnd <= m_sString.getLength() ), "StringToken::StringToken: invalid token end!" );
- }
-
- // ------------------------------------------------------------------------
- StringToken::StringToken( const StringToken& _rRHS )
- {
- *this = _rRHS;
- }
-
- // ------------------------------------------------------------------------
- StringToken& StringToken::operator=( const StringToken& _rRHS )
- {
- if ( this == &_rRHS )
- return *this;
-
- m_sString = _rRHS.m_sString;
- m_nTokenStart = _rRHS.m_nTokenStart;
- m_nTokenEnd = _rRHS.m_nTokenEnd;
-
- return *this;
- }
-
- // ------------------------------------------------------------------------
- bool StringToken::toInt32( sal_Int32& _rValue ) const
- {
- if ( isEmpty() )
- return false;
-
- _rValue = 0;
- const sal_Unicode* pStr = begin();
- while ( pStr < end() )
- {
- if ( ( *pStr < '0' ) || ( *pStr > '9' ) )
- return false;
-
- _rValue *= 10;
- _rValue += ( *pStr - '0' );
-
- ++pStr;
- }
-
- return true;
- }
-
- // ========================================================================
- class StringTokenizer
- {
- private:
- OUString m_sString;
- const sal_Unicode m_nTokenSeparator;
- sal_Int32 m_nTokenStart;
-
- public:
- /** constructs a tokenizer
- @param _rString the string to tokenize
- @param _nTokenSeparator the token value. May be 0, in this case the tokenizer
- will recognize exactly one token, being the whole string.
- This may make sense if you want to apply <type>StringToken</type>
- methods to a whole string.
- */
- StringTokenizer( const OUString& _rString, sal_Unicode _nTokenSeparator = ';' );
-
- /// resets the tokenizer to the beginning of the string
- void reset();
-
- /// determines whether there is a next token
- bool hasNextToken() const;
-
- /// retrieves the next token
- StringToken
- getNextToken();
- };
-
- // ------------------------------------------------------------------------
- StringTokenizer::StringTokenizer( const OUString& _rString, sal_Unicode _nTokenSeparator )
- :m_sString( _rString )
- ,m_nTokenSeparator( _nTokenSeparator )
- {
- reset();
- }
-
- // ------------------------------------------------------------------------
- void StringTokenizer::reset()
- {
- m_nTokenStart = 0;
- }
-
- // ------------------------------------------------------------------------
- bool StringTokenizer::hasNextToken() const
- {
- return ( m_nTokenStart < m_sString.getLength() );
- }
-
- // ------------------------------------------------------------------------
- StringToken StringTokenizer::getNextToken()
- {
- OSL_PRECOND( hasNextToken(), "StringTokenizer::getNextToken: there is no next token!" );
- if ( !hasNextToken() )
- return StringToken();
-
- // determine the end of the current token
- sal_Int32 nTokenEnd = m_nTokenSeparator ? m_sString.indexOf( m_nTokenSeparator, m_nTokenStart ) : m_sString.getLength();
- bool bLastToken = !m_nTokenSeparator || ( nTokenEnd == -1 );
-
- // construct a new token
- StringToken aToken( m_sString, m_nTokenStart, bLastToken ? m_sString.getLength() : nTokenEnd );
- // advance
- m_nTokenStart = bLastToken ? m_sString.getLength() : nTokenEnd + 1;
- // outta here
- return aToken;
- }
-
- // ========================================================================
// ------------------------------------------------------------------------
OUString lcl_toXSD_OUString( const Any& rAny )
{ OUString sStr; rAny >>= sStr; return sStr; }
commit 861a1814d51a4f49981961bb5d3a56ab7f4317d7
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 10:30:37 2013 +0100
-Werror,-Wunused-member-function
writeTransformAttribute was unused since its inception in
90f5ce36231551e226d4b3e2fefaa8493af692ac "svg-import-filter.diff: SVG Import
Filter implementation in filter module."
Change-Id: Ifa7a13f9665d59fcc1cf8c9c3d48685bddc8bd59
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index b1c5916..72ff68f 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1576,29 +1576,6 @@ struct ShapeWritingVisitor
}
- void writeTransformAttribute(const basegfx::B2DHomMatrix rMatrix, rtl::Reference<SvXMLAttributeList>& xAttrs)
- {
- basegfx::B2DTuple rScale, rTranslate;
- double rRotate, rShearX;
- OUString sTransformValue;
- if (!rMatrix.decompose(rScale, rTranslate, rRotate, rShearX))
- return;
- if (rScale.getX() != 1.0 || rScale.getY() != 1.0)
- sTransformValue += "scale("+OUString::number(rScale.getX())+" "
- +OUString::number(rScale.getY())+") ";
- if (rTranslate.getX() != 0.0f || rTranslate.getY() != 0.0f)
- sTransformValue += "translate("+OUString::number(rTranslate.getX()/100.0f)+"mm "
- +OUString::number(rTranslate.getY()/100.0f)+"mm) ";
- if (rRotate != 0.0f)
- sTransformValue += "rotate("+OUString::number(rRotate)+") ";
-
- if (rShearX != 0.0f)
- sTransformValue += "skewX("+OUString::number(rShearX)+") ";
- if (sTransformValue.isEmpty())
- return;
- xAttrs->AddAttribute( "draw:transform", sTransformValue);
- }
-
void writeEllipseShape( rtl::Reference<SvXMLAttributeList>& xAttrs,
const uno::Reference<xml::sax::XAttributeList>& xUnoAttrs,
const uno::Reference<xml::dom::XElement>& xElem,
commit 6e9e1dfc0550908c338901c69b71f36f083c8d88
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Nov 13 10:21:23 2013 +0100
-Werror,-Wshift-sign-overflow
Change-Id: I24a341ef92a41682622a3d497638b6724419a89b
diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx
index 7157b9b..2ee35fc 100644
--- a/include/filter/msfilter/escherex.hxx
+++ b/include/filter/msfilter/escherex.hxx
@@ -42,42 +42,42 @@
/*Record Name FBT-Value Instance Contents Wrd Exl PPt Ver*/
// In the Microsoft documentation the naming scheme is msofbt... instead of ESCHER_...
-#define ESCHER_DggContainer 0xF000 /* per-document data X X X */
-#define ESCHER_Dgg 0xF006 /* an FDGG and several FIDCLs X X X 0 */
-#define ESCHER_CLSID 0xF016 /* the CLSID of the application that put the data on the clipboard C C C 0 */
-#define ESCHER_OPT 0xF00B /* count of properties the document-wide default shape properties X X X 3 */
-#define ESCHER_ColorMRU 0xF11A /* count of colors the colors in the MRU swatch X X X 0 */
-#define ESCHER_SplitMenuColors 0xF11E /* count of colors the colors in the top-level split menus X X X 0 */
-#define ESCHER_BstoreContainer 0xF001 /* count of BLIPs all images in the document (JPEGs, metafiles, etc.) X X X */
-#define ESCHER_BSE 0xF007 /* BLIP type an FBSE (one per BLIP) X X X 2 */
-#define ESCHER_BlipFirst 0xF018 /* range of fbts reserved for various kinds of BLIPs X X X */
-#define ESCHER_BlipLast 0xF117 /* range of fbts reserved for various kinds of BLIPs X X X */
-
-#define ESCHER_DgContainer 0xF002 /* per-sheet/page/slide data X X X */
-#define ESCHER_Dg 0xF008 /* drawing ID an FDG X X X 0 */
-#define ESCHER_RegroupItems 0xF118 /* count of regroup entries several FRITs X X X 0 */
-#define ESCHER_ColorScheme 0xF120 /* count of colors the colors of the source host's color scheme C C 0 */
-#define ESCHER_SpgrContainer 0xF003 /* several SpContainers, the first of which is the group shape itself X X X */
-#define ESCHER_SpContainer 0xF004 /* a shape X X X */
-#define ESCHER_Spgr 0xF009 /* an FSPGR; only present if the shape is a group shape X X X 1 */
-#define ESCHER_Sp 0xF00A /* shape type an FSP X X X 2 */
-//#define ESCHER_OPT 0xF00B /* count of properties a shape property table X X X 3 */
-#define ESCHER_Textbox 0xF00C /* RTF text C C C 0 */
-#define ESCHER_ClientTextbox 0xF00D /* host-defined the text in the textbox, in host-defined format X X X */
-#define ESCHER_Anchor 0xF00E /* a RECT, in 100000ths of an inch C C C 0 */
-#define ESCHER_ChildAnchor 0xF00F /* a RECT, in units relative to the parent group X X X 0 */
-#define ESCHER_ClientAnchor 0xF010 /* host-defined the location of the shape, in a host-defined format X X X */
-#define ESCHER_ClientData 0xF011 /* host-defined host-specific data X X X */
-#define ESCHER_OleObject 0xF11F /* a serialized IStorage for an OLE object C C C 0 */
-#define ESCHER_DeletedPspl 0xF11D /* an FPSPL; only present in top-level deleted shapes X 0 */
-#define ESCHER_SolverContainer 0xF005 /* count of rules the rules governing shapes X X X */
-#define ESCHER_ConnectorRule 0xF012 /* an FConnectorRule X X 1 */
-#define ESCHER_AlignRule 0xF013 /* an FAlignRule X X X 0 */
-#define ESCHER_ArcRule 0xF014 /* an FARCRU X X X 0 */
-#define ESCHER_ClientRule 0xF015 /* host-defined host-defined */
-#define ESCHER_CalloutRule 0xF017 /* an FCORU X X X 0 */
-#define ESCHER_Selection 0xF119 /* an FDGSL followed by the SPIDs of the shapes in the selection X 0 */
-#define ESCHER_UDefProp 0xF122
+#define ESCHER_DggContainer 0xF000u /* per-document data X X X */
+#define ESCHER_Dgg 0xF006u /* an FDGG and several FIDCLs X X X 0 */
+#define ESCHER_CLSID 0xF016u /* the CLSID of the application that put the data on the clipboard C C C 0 */
+#define ESCHER_OPT 0xF00Bu /* count of properties the document-wide default shape properties X X X 3 */
+#define ESCHER_ColorMRU 0xF11Au /* count of colors the colors in the MRU swatch X X X 0 */
+#define ESCHER_SplitMenuColors 0xF11Eu /* count of colors the colors in the top-level split menus X X X 0 */
+#define ESCHER_BstoreContainer 0xF001u /* count of BLIPs all images in the document (JPEGs, metafiles, etc.) X X X */
+#define ESCHER_BSE 0xF007u /* BLIP type an FBSE (one per BLIP) X X X 2 */
+#define ESCHER_BlipFirst 0xF018u /* range of fbts reserved for various kinds of BLIPs X X X */
+#define ESCHER_BlipLast 0xF117u /* range of fbts reserved for various kinds of BLIPs X X X */
+
+#define ESCHER_DgContainer 0xF002u /* per-sheet/page/slide data X X X */
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list