strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upcoming loplugin:elidestringvar: sdext

Browse source 
Change-Id: I841062adcfea55e072354830584651a6887bc0fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95546
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2020-06-05 07:36:44 +02:00
parent c288a97e89
commit 41541c2c1b
6 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sdext/source/minimizer/impoptimizer.cxx
View file

@ -668,8 +668,7 @@ void ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments )
Reference< XFrame > xFrame( xSelf.is() ? xSelf : mxInformationDialog );
if ( xFrame.is() )
{
const OUString sSlot( "slot:27115" );
DispatchURL( mxContext, sSlot, xFrame );
DispatchURL( mxContext, "slot:27115", xFrame );
}
}

4
sdext/source/minimizer/optimizerdialog.cxx
View file

@ -120,9 +120,7 @@ void OptimizerDialog::InitRoadmap()
InsertRoadmapItem( 3, getString( STR_OLE_OBJECTS ), ITEM_ID_OLE_OPTIMIZATION );
InsertRoadmapItem( 4, getString( STR_SUMMARY ), ITEM_ID_SUMMARY );
OUString const sURL("private:graphicrepository/" BMP_PRESENTATION_MINIMIZER);
xPropertySet->setPropertyValue( "ImageURL", Any( sURL ) );
xPropertySet->setPropertyValue( "ImageURL", Any( OUString("private:graphicrepository/" BMP_PRESENTATION_MINIMIZER) ) );
xPropertySet->setPropertyValue( "Activated", Any( true ) );
xPropertySet->setPropertyValue( "Complete", Any( true ) );
xPropertySet->setPropertyValue( "CurrentItemID", Any( sal_Int16(ITEM_ID_INTRODUCTION) ) );

12
sdext/source/minimizer/optimizerdialogcontrols.cxx
View file

@ -557,9 +557,8 @@ void OptimizerDialog::InitPage3()
Reference< XShapes > xShapes( xDrawPages->getByIndex( i ), UNO_QUERY_THROW );
for ( sal_Int32 j = 0; j < xShapes->getCount(); j++ )
{
const OUString sOLE2Shape( "com.sun.star.drawing.OLE2Shape" );
Reference< XShape > xShape( xShapes->getByIndex( j ), UNO_QUERY_THROW );
if ( xShape->getShapeType() == sOLE2Shape )
if ( xShape->getShapeType() == "com.sun.star.drawing.OLE2Shape" )
nOLECount++;
}
}
@ -678,8 +677,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
{
Reference< XPropertySet > xPropSet( rxPage, UNO_QUERY_THROW );
bool bVisible = true;
const OUString sVisible( "Visible" );
if ( xPropSet->getPropertyValue( sVisible ) >>= bVisible )
if ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible )
{
if (!bVisible )
nDeletedSlides++;
@ -696,8 +694,7 @@ void OptimizerDialog::UpdateControlStatesPage4()
Reference< XPropertySet > xPropSet( xDrawPage, UNO_QUERY_THROW );
bool bVisible = true;
const OUString sVisible( "Visible" );
if ( xPropSet->getPropertyValue( sVisible ) >>= bVisible )
if ( xPropSet->getPropertyValue( "Visible" ) >>= bVisible )
{
if (!bVisible )
nDeletedSlides++;
@ -763,9 +760,8 @@ void OptimizerDialog::UpdateControlStatesPage4()
Reference< XShapes > xShapes( xDrawPages->getByIndex( i ), UNO_QUERY_THROW );
for ( sal_Int32 j = 0; j < xShapes->getCount(); j++ )
{
const OUString sOLE2Shape( "com.sun.star.drawing.OLE2Shape" );
Reference< XShape > xShape( xShapes->getByIndex( j ), UNO_QUERY_THROW );
if ( xShape->getShapeType() == sOLE2Shape )
if ( xShape->getShapeType() == "com.sun.star.drawing.OLE2Shape" )
nOLEReplacements++;
}
}

6
sdext/source/minimizer/unodialog.cxx
View file

@ -296,15 +296,13 @@ Any UnoDialog::getControlProperty( const OUString& rControlName, const OUString&
void UnoDialog::enableControl( const OUString& rControlName )
{
const OUString sEnabled( "Enabled" );
setControlProperty( rControlName, sEnabled, Any( true ) );
setControlProperty( rControlName, "Enabled", Any( true ) );
}
void UnoDialog::disableControl( const OUString& rControlName )
{
const OUString sEnabled( "Enabled" );
setControlProperty( rControlName, sEnabled, Any( false ) );
setControlProperty( rControlName, "Enabled", Any( false ) );
}

3
sdext/source/pdfimport/odf/odfemitter.cxx
View file

@ -58,8 +58,7 @@ OdfEmitter::OdfEmitter( const uno::Reference<io::XOutputStream>& xOutput ) :
OSL_PRECOND(m_xOutput.is(), "OdfEmitter(): invalid output stream");
m_aLineFeed[0] = '\n';
OUString aElement = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
write(aElement);
write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
}
void OdfEmitter::beginTag( const char* pTag, const PropertyMap& rProperties )

3
sdext/source/presenter/PresenterTheme.cxx
View file

@ -964,11 +964,10 @@ void ViewStyleContainer::ProcessViewStyle(
}
}
const OUString sPathToFont; // empty string
Reference<container::XHierarchicalNameAccess> xFontNode (
PresenterConfigurationAccess::GetProperty(rxProperties, "Font"), UNO_QUERY);
PresenterTheme::SharedFontDescriptor pFont (
ReadContext::ReadFont(xFontNode, sPathToFont, PresenterTheme::SharedFontDescriptor()));
ReadContext::ReadFont(xFontNode, "", PresenterTheme::SharedFontDescriptor()));
if (pFont)
pStyle->mpFont = pFont;