framework/source/layoutmanager/toolbarlayoutmanager.cxx | 4 ---
sal/qa/osl/file/osl_old_test_file.cxx | 17 ----------------
2 files changed, 21 deletions(-)
New commits:
commit 6f1bdda2d26dc26f91fd327c82bc7d4b9ee6ab92
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Oct 11 15:01:47 2012 +0100
loplugin: more unused OUStrings and so forth
Change-Id: I4f3a51e1fd3ddca9442022a7134306fbf32e13ae
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 3a490d4..179725a 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -783,9 +783,6 @@ bool ToolbarLayoutManager::dockAllToolbars()
{
std::vector< ::rtl::OUString > aToolBarNameVector;
- ::rtl::OUString aElementType;
- ::rtl::OUString aElementName;
-
ReadGuard aReadLock( m_aLock );
UIElementVector::iterator pIter;
for ( pIter = m_aUIElements.begin(); pIter != m_aUIElements.end(); ++pIter
)
@@ -981,7 +978,6 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
if (isPreviewFrame())
return; // no addon toolbars for preview frame!
- UIElementVector aUIElementVector;
uno::Sequence< uno::Sequence< beans::PropertyValue > > aAddonToolBarData;
uno::Reference< ui::XUIElement > xUIElement;
diff --git a/sal/qa/osl/file/osl_old_test_file.cxx
b/sal/qa/osl/file/osl_old_test_file.cxx
index 0d2379e..13c46b4 100644
--- a/sal/qa/osl/file/osl_old_test_file.cxx
+++ b/sal/qa/osl/file/osl_old_test_file.cxx
@@ -26,12 +26,6 @@
*
************************************************************************/
-// LLA:
-// this file is converted to use with testshl2
-// original was placed in sal/test/textenc.cxx
-
-#include <stdio.h>
-
#include <osl/file.h>
#include <osl/process.h>
#include <rtl/ustring.hxx>
@@ -119,20 +113,12 @@ void oldtestfile::test_file_001()
OUString target;
OUString rel = OUString::createFromAscii( aSource1[i] );
oslFileError e = osl_getAbsoluteFileURL( base1.pData, rel.pData ,
&target.pData );
- //fprintf(stderr, "%d : %s -- %s -- %s\n", i, aSource1[i],
aSource1[i+1], OUStringToOString(target , RTL_TEXTENCODING_ASCII_US ).getStr()
);
CPPUNIT_ASSERT_MESSAGE("failure #1", osl_File_E_None == e );
if( osl_File_E_None == e )
{
CPPUNIT_ASSERT_MESSAGE("failure #1.1", target.equalsAscii(
aSource1[i+1] ) );
}
- OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US );
- OString obase = OUStringToOString( base1 , RTL_TEXTENCODING_ASCII_US );
- // fprintf( stderr, "%d %s + %s = %s\n" ,e, obase.getStr(),
aSource1[i], o.pData->buffer );
}
-
- OUString err1( RTL_CONSTASCII_USTRINGPARAM( "../.." ) );
- OUString target;
- // CPPUNIT_ASSERT_MESSAGE("failure #11", osl_File_E_None !=
osl_getAbsoluteFileURL( base1.pData , err1.pData , &target.pData ) );
#endif
}
@@ -146,14 +132,11 @@ void oldtestfile::test_file_002()
OUString target;
OUString rel = OUString::createFromAscii( aSource2[i] );
oslFileError e = osl_getAbsoluteFileURL( base2.pData, rel.pData ,
&target.pData );
- //fprintf(stderr, "%d : %s -- %s -- %s\n", i, aSource2[i],
aSource2[i+1], OUStringToOString(target , RTL_TEXTENCODING_ASCII_US ).getStr()
);
CPPUNIT_ASSERT_MESSAGE("failure #2", osl_File_E_None == e );
if( osl_File_E_None == e )
{
CPPUNIT_ASSERT_MESSAGE("failure #2.1", target.equalsAscii(
aSource2[i+1] ) );
}
- OString o = OUStringToOString( target , RTL_TEXTENCODING_ASCII_US );
- OString obase = OUStringToOString( base2 , RTL_TEXTENCODING_ASCII_US );
}
#endif
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
