diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2016-12-18 14:31:14 +0100 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2016-12-19 07:26:24 +0000 |
| commit | bf5f6df9e47bd31dc052c6411f6f88ec2d4e3cea (patch) | |
| tree | f573562af0d55e5cdb0bfe405db2967efd72d2e8 /vcl/osx | |
| parent | f9a97a5d5aca8473845bca2e17c5826b772b8f3c (diff) | |
vcl: separate ImplImageTree - ImageTree singleton and public iface
ImplImageTree was used outside of VCL which is not consistent with
the name and the header also contains a lot of implementation
detail. This separates the implementation to ImplImageTree and
the public interface and singleton to ImageTree only.
Change-Id: I3a26444f0f6971a6b1d83472e9cef19c93192d3e
Reviewed-on: https://gerrit.libreoffice.org/32134
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Tested-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/osx')
| -rw-r--r-- | vcl/osx/vclnsapp.mm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vcl/osx/vclnsapp.mm b/vcl/osx/vclnsapp.mm index a8eb84aa297d..4c38466961b0 100644 --- a/vcl/osx/vclnsapp.mm +++ b/vcl/osx/vclnsapp.mm @@ -24,7 +24,7 @@ #include <sal/main.h> #include <vcl/commandevent.hxx> -#include <vcl/implimagetree.hxx> +#include <vcl/ImageTree.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> @@ -374,8 +374,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP (void)app; std::vector<OUString> aFile; aFile.push_back( GetOUString( pFile ) ); - const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Print, aFile); - AquaSalInstance::aAppEventList.push_back( pAppEvent ); + const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Print, aFile); + AquaSalInstance::aAppEventList.push_back( pAppEvent ); return YES; } -(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels @@ -393,8 +393,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP { aFileList.push_back( GetOUString( pFile ) ); } - const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Print, aFileList); - AquaSalInstance::aAppEventList.push_back( pAppEvent ); + const ApplicationEvent* pAppEvent = new ApplicationEvent(ApplicationEvent::Type::Print, aFileList); + AquaSalInstance::aAppEventList.push_back( pAppEvent ); // we have no back channel here, we have to assume success // correct handling would be NSPrintingReplyLater and then send [app replyToOpenOrPrint] return NSPrintingSuccess; @@ -425,7 +425,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP { ApplicationEvent aEv(ApplicationEvent::Type::PrivateDoShutdown); GetpApp()->AppEvent( aEv ); - ImplImageTree::get().shutDown(); + ImageTree::get().shutdown(); // DeInitVCL should be called in ImplSVMain - unless someon _exits first which // can occur in Desktop::doShutdown for example } @@ -440,8 +440,8 @@ SAL_WNODEPRECATED_DECLARATIONS_POP SolarMutexGuard aGuard; const SalData* pSalData = GetSalData(); - if( !pSalData->maFrames.empty() ) - pSalData->maFrames.front()->CallCallback( SalEvent::SettingsChanged, nullptr ); + if( !pSalData->maFrames.empty() ) + pSalData->maFrames.front()->CallCallback( SalEvent::SettingsChanged, nullptr ); } -(void)screenParametersChanged: (NSNotification*) pNotification |