diff options
| -rw-r--r-- | filter/source/graphicfilter/eps/eps.cxx | 27 | ||||
| -rw-r--r-- | framework/source/uielement/controlmenucontroller.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/appl/shutdowniconunx.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/filter/graphicfilter.cxx | 2 |
4 files changed, 11 insertions, 23 deletions
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index d5fbde1ee44e..a8bfd98c4410 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -310,28 +310,23 @@ bool PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, Filter // try to get the dialog selection if ( pFilterConfigItem ) { - std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr( "eps", Application::GetSettings().GetUILanguageTag() )); - - if( pResMgr ) - { #ifdef UNX // don't put binary tiff preview ahead of postscript code by default on unix as ghostscript is unable to read it - mnPreview = pFilterConfigItem->ReadInt32( "Preview", 0 ); + mnPreview = pFilterConfigItem->ReadInt32( "Preview", 0 ); #else - mnPreview = pFilterConfigItem->ReadInt32( "Preview", 1 ); + mnPreview = pFilterConfigItem->ReadInt32( "Preview", 1 ); #endif - mnLevel = pFilterConfigItem->ReadInt32( "Version", 2 ); - if ( mnLevel != 1 ) - mnLevel = 2; - mbGrayScale = pFilterConfigItem->ReadInt32( "ColorFormat", 1 ) == 2; + mnLevel = pFilterConfigItem->ReadInt32( "Version", 2 ); + if ( mnLevel != 1 ) + mnLevel = 2; + mbGrayScale = pFilterConfigItem->ReadInt32( "ColorFormat", 1 ) == 2; #ifdef UNX // don't compress by default on unix as ghostscript is unable to read LZW compressed eps - mbCompression = pFilterConfigItem->ReadInt32( "CompressionMode", 0 ) != 0; + mbCompression = pFilterConfigItem->ReadInt32( "CompressionMode", 0 ) != 0; #else - mbCompression = pFilterConfigItem->ReadInt32( "CompressionMode", 1 ) == 1; + mbCompression = pFilterConfigItem->ReadInt32( "CompressionMode", 1 ) == 1; #endif - mnTextMode = pFilterConfigItem->ReadInt32( "TextMode", 0 ); - if ( mnTextMode > 2 ) - mnTextMode = 0; - } + mnTextMode = pFilterConfigItem->ReadInt32( "TextMode", 0 ); + if ( mnTextMode > 2 ) + mnTextMode = 0; } // compression is not available for Level 1 diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index ca5fd47985d9..b9975db9ade3 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -178,7 +178,6 @@ ControlMenuController::ControlMenuController(const css::uno::Reference< css::uno // private function void ControlMenuController::updateImagesPopupMenu( PopupMenu* pPopupMenu ) { - std::unique_ptr<ResMgr> xResMgr(ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag())); for (sal_uInt32 i=0; i < SAL_N_ELEMENTS(aCommands); ++i) { //ident is .uno:Command without .uno: diff --git a/sfx2/source/appl/shutdowniconunx.cxx b/sfx2/source/appl/shutdowniconunx.cxx index 66ed890a9843..1bdf3e2e5ef5 100644 --- a/sfx2/source/appl/shutdowniconunx.cxx +++ b/sfx2/source/appl/shutdowniconunx.cxx @@ -26,7 +26,6 @@ #include <gtk/gtk.h> #include <glib.h> #include <osl/module.hxx> -#include <tools/resmgr.hxx> #include <sfx2/app.hxx> #include "app.hrc" #include "shutdownicon.hxx" @@ -48,7 +47,6 @@ using namespace ::osl; -static ResMgr *pVCLResMgr; static GtkStatusIcon* pTrayIcon; static GtkWidget *pExitMenuItem = nullptr; static GtkWidget *pOpenMenuItem = nullptr; @@ -330,8 +328,6 @@ void plugin_init_sys_tray() pShutdownIcon->GetResString( STR_QUICKSTART_TIP ), RTL_TEXTENCODING_UTF8 ); - pVCLResMgr = ResMgr::CreateResMgr("vcl"); - pTrayIcon = gtk_status_icon_new_from_icon_name ("libreoffice-startcenter"); g_object_set (pTrayIcon, "title", aLabel.getStr(), diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 8f4b1474e850..3027c25062c8 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -820,8 +820,6 @@ static Graphic ImpGetScaledGraphic( const Graphic& rGraphic, FilterConfigItem& r { Graphic aGraphic; - std::unique_ptr<ResMgr> xResMgr(ResMgr::CreateResMgr( "svt", Application::GetSettings().GetUILanguageTag() )); - sal_Int32 nLogicalWidth = rConfigItem.ReadInt32( "LogicalWidth", 0 ); sal_Int32 nLogicalHeight = rConfigItem.ReadInt32( "LogicalHeight", 0 ); |