[Libreoffice-commits] core.git: 3 commits - basic/source filter/source sdext/source toolkit/source winaccessibility/inc winaccessibility/source
Thomas Arnhold
thomas at arnhold.org
Wed May 14 09:15:41 PDT 2014
basic/source/runtime/methods.cxx | 17 ---
filter/source/svg/test/odfserializer.hxx | 2
sdext/source/minimizer/configurationaccess.hxx | 24 +---
sdext/source/minimizer/fileopendialog.hxx | 6 -
sdext/source/minimizer/graphiccollector.hxx | 24 ++--
sdext/source/minimizer/impoptimizer.hxx | 14 +-
sdext/source/minimizer/informationdialog.hxx | 22 +--
sdext/source/minimizer/optimizationstats.hxx | 12 +-
sdext/source/minimizer/optimizerdialog.hxx | 76 ++++++-------
sdext/source/minimizer/pagecollector.hxx | 8 -
sdext/source/minimizer/pppoptimizer.hxx | 36 +++---
sdext/source/minimizer/pppoptimizerdialog.hxx | 64 +++++------
sdext/source/minimizer/unodialog.hxx | 74 ++++++-------
sdext/source/pdfimport/filterdet.hxx | 24 ++--
sdext/source/pdfimport/inc/contentsink.hxx | 68 ++++++------
sdext/source/pdfimport/inc/odfemitter.hxx | 4
sdext/source/pdfimport/inc/pdfihelper.hxx | 26 ++--
sdext/source/pdfimport/inc/saxemitter.hxx | 4
sdext/source/pdfimport/inc/wrapper.hxx | 20 +--
sdext/source/pdfimport/pdfiadaptor.hxx | 58 +++++-----
sdext/source/pdfimport/sax/emitcontext.hxx | 8 -
sdext/source/pdfimport/sax/saxattrlist.hxx | 10 -
sdext/source/pdfimport/test/outputwrap.hxx | 8 -
sdext/source/pdfimport/tree/drawtreevisiting.hxx | 14 +-
sdext/source/pdfimport/tree/genericelements.hxx | 14 +-
sdext/source/pdfimport/tree/imagecontainer.hxx | 8 -
sdext/source/pdfimport/tree/pdfiprocessor.hxx | 84 +++++++--------
sdext/source/presenter/PresenterButton.hxx | 2
sdext/source/presenter/PresenterController.hxx | 12 +-
sdext/source/presenter/PresenterCurrentSlideObserver.hxx | 24 ++--
sdext/source/presenter/PresenterFrameworkObserver.hxx | 2
sdext/source/presenter/PresenterHelpView.hxx | 2
sdext/source/presenter/PresenterNotesView.hxx | 2
sdext/source/presenter/PresenterPaneBorderPainter.hxx | 2
sdext/source/presenter/PresenterPaneContainer.hxx | 4
sdext/source/presenter/PresenterPaneFactory.hxx | 12 +-
sdext/source/presenter/PresenterSlidePreview.hxx | 2
sdext/source/presenter/PresenterSlideShowView.hxx | 8 -
sdext/source/presenter/PresenterSlideSorter.hxx | 2
sdext/source/presenter/PresenterSprite.hxx | 2
sdext/source/presenter/PresenterTextView.hxx | 2
sdext/source/presenter/PresenterToolBar.hxx | 2
sdext/source/presenter/PresenterViewFactory.hxx | 2
sdext/source/presenter/PresenterWindowManager.hxx | 6 -
toolkit/source/awt/vclxsystemdependentwindow.cxx | 2
winaccessibility/inc/AccObjectWinManager.hxx | 2
winaccessibility/source/UAccCOM/AccTable.cxx | 3
47 files changed, 403 insertions(+), 421 deletions(-)
New commits:
commit 7249ba6877ef687fd787375e18678c5f1f417a49
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed May 14 17:43:00 2014 +0200
remove external header guards
that's the problem with those: none of them was actually defined...
Change-Id: I496140e43cf8ff8a5712394023d98516aaf21adc
diff --git a/filter/source/svg/test/odfserializer.hxx b/filter/source/svg/test/odfserializer.hxx
index cda1b9e..4fd47b5 100644
--- a/filter/source/svg/test/odfserializer.hxx
+++ b/filter/source/svg/test/odfserializer.hxx
@@ -31,6 +31,6 @@ namespace svgi
createSerializer(const ::com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& );
}
-#endif // _COM_SUN_STAR_XML_SAX_XDOCUMENTHANDLER_HDL_
+#endif // INCLUDED_FILTER_SOURCE_SVG_TEST_ODFSERIALIZER_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 8fcc561..5157ef6 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#ifndef INCLUDED_SDEXT_SOURCE_MINIMIZER_CONFIGURATIONACCESS_HXX
#define INCLUDED_SDEXT_SOURCE_MINIMIZER_CONFIGURATIONACCESS_HXX
+
#include <vector>
#include "pppoptimizertoken.hxx"
#include <com/sun/star/awt/Size.hpp>
@@ -29,9 +29,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT
#include <com/sun/star/uno/XComponentContext.hpp>
-#endif
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
#include <map>
diff --git a/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index 39f71da..05dc385 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.cxx
@@ -19,7 +19,7 @@
#include <com/sun/star/lang/SystemDependent.hpp>
-#if defined UNX && ! defined MACOSX && ! defined _COM_SUN_STAR_AWT_SYSTEMDEPENDENTXWINDOW_HPP_
+#if defined UNX && ! defined MACOSX
#include <com/sun/star/awt/SystemDependentXWindow.hpp>
#endif
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index 66b74b4..99c866e 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -20,9 +20,7 @@
#ifndef INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTWINMANAGER_HXX
#define INCLUDED_WINACCESSIBILITY_INC_ACCOBJECTWINMANAGER_HXX
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLE_HPP_
#include <com/sun/star/accessibility/XAccessible.hpp>
-#endif
#include <map>
#include <windows.h>
#include <osl/mutex.hxx>
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx
index 8d1fbd5..c945ad7 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -29,10 +29,7 @@
#include <com/sun/star/accessibility/XAccessible.hpp>
#include "MAccessible.h"
-
-#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLETABLEEXTENT_HPP_
#include <com/sun/star/accessibility/XAccessibleTableSelection.hpp>
-#endif
using namespace com::sun::star::accessibility;
using namespace com::sun::star::uno;
commit b81ec527f0bc07f1d988b2393e3ec02503cd72e4
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Wed May 14 18:03:20 2014 +0200
use our css prefix to make this readable
Change-Id: I360832edafcfcff7e63fd3b185c2575165c2d728
diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx
index 3a186ba..8fcc561 100644
--- a/sdext/source/minimizer/configurationaccess.hxx
+++ b/sdext/source/minimizer/configurationaccess.hxx
@@ -72,8 +72,8 @@ struct OptimizerSettings
mnEstimatedFileSize( 0 ){};
~OptimizerSettings(){};
- void LoadSettingsFromConfiguration( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess >& rSettings );
- void SaveSettingsToConfiguration( const com::sun::star::uno::Reference< com::sun::star::container::XNameReplace >& rSettings );
+ void LoadSettingsFromConfiguration( const css::uno::Reference< css::container::XNameAccess >& rSettings );
+ void SaveSettingsToConfiguration( const css::uno::Reference< css::container::XNameReplace >& rSettings );
bool operator==( const OptimizerSettings& rOptimizerSettings ) const;
@@ -82,7 +82,7 @@ class ConfigurationAccess
{
public :
- ConfigurationAccess( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rXFactory,
+ ConfigurationAccess( const css::uno::Reference< css::uno::XComponentContext >& rXFactory,
OptimizerSettings* pDefaultSettings = NULL );
~ConfigurationAccess();
void SaveConfiguration();
@@ -90,14 +90,14 @@ class ConfigurationAccess
OUString getString( const PPPOptimizerTokenEnum ) const;
// access to current OptimizerSettings (stored in the first entry of maSettings)
- com::sun::star::uno::Any GetConfigProperty( const PPPOptimizerTokenEnum ) const;
- void SetConfigProperty( const PPPOptimizerTokenEnum, const com::sun::star::uno::Any& aValue );
+ css::uno::Any GetConfigProperty( const PPPOptimizerTokenEnum ) const;
+ void SetConfigProperty( const PPPOptimizerTokenEnum, const css::uno::Any& aValue );
bool GetConfigProperty( const PPPOptimizerTokenEnum, const bool bDefault ) const;
sal_Int16 GetConfigProperty( const PPPOptimizerTokenEnum, const sal_Int16 nDefault ) const;
sal_Int32 GetConfigProperty( const PPPOptimizerTokenEnum, const sal_Int32 nDefault ) const;
- com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > GetConfigurationSequence();
+ css::uno::Sequence< css::beans::PropertyValue > GetConfigurationSequence();
// getting access to the OptimizerSettings list
std::vector< OptimizerSettings >& GetOptimizerSettings() { return maSettings; };
@@ -117,13 +117,13 @@ class ConfigurationAccess
std::vector< OptimizerSettings > maSettings;
std::vector< OptimizerSettings > maInitialSettings;
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
void LoadStrings();
void LoadConfiguration();
- com::sun::star::uno::Reference< com::sun::star::uno::XInterface > OpenConfiguration( bool bReadOnly );
- com::sun::star::uno::Reference< com::sun::star::uno::XInterface > GetConfigurationNode(
- const com::sun::star::uno::Reference< com::sun::star::uno::XInterface >& xRoot, const OUString& sPathToNode );
+ css::uno::Reference< css::uno::XInterface > OpenConfiguration( bool bReadOnly );
+ css::uno::Reference< css::uno::XInterface > GetConfigurationNode(
+ const css::uno::Reference< css::uno::XInterface >& xRoot, const OUString& sPathToNode );
};
#endif // INCLUDED_SDEXT_SOURCE_MINIMIZER_CONFIGURATIONACCESS_HXX
diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx
index 6668795..0cc452c 100644
--- a/sdext/source/minimizer/fileopendialog.hxx
+++ b/sdext/source/minimizer/fileopendialog.hxx
@@ -37,17 +37,17 @@ class FileOpenDialog
OUString maUIName;
OUString maFilter;
sal_Int32 maFlags;
- com::sun::star::uno::Sequence< OUString > maExtensions;
+ css::uno::Sequence< OUString > maExtensions;
FilterEntry() :
maFlags( 0 ) {}
};
- com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker3 > mxFilePicker;
+ css::uno::Reference < css::ui::dialogs::XFilePicker3 > mxFilePicker;
std::vector< FilterEntry > aFilterEntryList;
public :
- FileOpenDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext );
+ FileOpenDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
~FileOpenDialog();
sal_Int16 execute();
diff --git a/sdext/source/minimizer/graphiccollector.hxx b/sdext/source/minimizer/graphiccollector.hxx
index 6a56add..70dfcde 100644
--- a/sdext/source/minimizer/graphiccollector.hxx
+++ b/sdext/source/minimizer/graphiccollector.hxx
@@ -54,13 +54,13 @@ class GraphicCollector
struct GraphicUser
{
- com::sun::star::uno::Reference< com::sun::star::drawing::XShape > mxShape; // if mbFillBitmap is false the xShape has
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPropertySet; // to be used otherwise the PropertySet
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxPagePropertySet;
+ css::uno::Reference< css::drawing::XShape > mxShape; // if mbFillBitmap is false the xShape has
+ css::uno::Reference< css::beans::XPropertySet > mxPropertySet; // to be used otherwise the PropertySet
+ css::uno::Reference< css::beans::XPropertySet > mxPagePropertySet;
OUString maGraphicURL;
OUString maGraphicStreamURL;
- com::sun::star::text::GraphicCrop maGraphicCropLogic;
- com::sun::star::awt::Size maLogicalSize;
+ css::text::GraphicCrop maGraphicCropLogic;
+ css::awt::Size maLogicalSize;
bool mbFillBitmap;
GraphicUser() : mxShape(), maGraphicCropLogic( 0, 0, 0, 0 ), mbFillBitmap( false ) {};
@@ -68,24 +68,24 @@ class GraphicCollector
struct GraphicEntity
{
- com::sun::star::awt::Size maLogicalSize; // the biggest logical size the graphic will be displayed
+ css::awt::Size maLogicalSize; // the biggest logical size the graphic will be displayed
bool mbRemoveCropArea;
- com::sun::star::text::GraphicCrop maGraphicCropLogic;
+ css::text::GraphicCrop maGraphicCropLogic;
std::vector< GraphicUser > maUser;
GraphicEntity( const GraphicUser& rUser )
: maLogicalSize( rUser.maLogicalSize ), mbRemoveCropArea( false ), maGraphicCropLogic( 0, 0, 0, 0 ) { maUser.push_back( rUser ); };
};
- static const com::sun::star::awt::DeviceInfo& GetDeviceInfo( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxFact );
- static com::sun::star::awt::Size GetOriginalSize( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF,
- const com::sun::star::uno::Reference< com::sun::star::graphic::XGraphic >& rxGraphic );
+ static const css::awt::DeviceInfo& GetDeviceInfo( const css::uno::Reference< css::uno::XComponentContext >& rxFact );
+ static css::awt::Size GetOriginalSize( const css::uno::Reference< css::uno::XComponentContext >& rxMSF,
+ const css::uno::Reference< css::graphic::XGraphic >& rxGraphic );
// collecting graphic instances, the downside of this method is that every graphic is swapped in
- static void CollectGraphics( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel,
+ static void CollectGraphics( const css::uno::Reference< css::uno::XComponentContext >& rxMSF, const css::uno::Reference< css::frame::XModel >& rxModel,
const GraphicSettings& rGraphicSettings, std::vector< GraphicEntity >& io_rGraphicList );
// counting graphics without swapping in graphics
- static void CountGraphics( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel,
+ static void CountGraphics( const css::uno::Reference< css::uno::XComponentContext >& rxMSF, const css::uno::Reference< css::frame::XModel >& rxModel,
const GraphicSettings& rGraphicSettings, sal_Int32& rGraphics );
};
diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx
index 8a27821..080fd10 100644
--- a/sdext/source/minimizer/impoptimizer.hxx
+++ b/sdext/source/minimizer/impoptimizer.hxx
@@ -38,9 +38,9 @@ class ImpOptimizer : public OptimizationStats
{
private:
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
- com::sun::star::uno::Reference< com::sun::star::frame::XModel > mxModel;
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::frame::XModel > mxModel;
+ css::uno::Reference< css::frame::XDispatch > mxStatusDispatcher;
bool mbJPEGCompression;
sal_Int32 mnJPEGQuality;
@@ -57,17 +57,17 @@ private:
OUString maFilterName;
bool mbOpenNewDocument;
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxInformationDialog;
+ css::uno::Reference< css::frame::XFrame > mxInformationDialog;
bool Optimize();
public:
- ImpOptimizer( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rXFactory,
- const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel );
+ ImpOptimizer( const css::uno::Reference< css::uno::XComponentContext >& rXFactory,
+ const css::uno::Reference< css::frame::XModel >& rxModel );
~ImpOptimizer();
- bool Optimize( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rArguments );
+ bool Optimize( const css::uno::Sequence< css::beans::PropertyValue >& rArguments );
void DispatchStatus();
};
diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx
index d3309cd..761bf07 100644
--- a/sdext/source/minimizer/informationdialog.hxx
+++ b/sdext/source/minimizer/informationdialog.hxx
@@ -46,8 +46,8 @@ class InformationDialog : public UnoDialog, public ConfigurationAccess
{
public :
- InformationDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame, const OUString& rSaveAsURL,
+ InformationDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext,
+ css::uno::Reference< css::frame::XFrame >& rxFrame, const OUString& rSaveAsURL,
bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest );
~InformationDialog();
@@ -55,11 +55,11 @@ public :
private :
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
- com::sun::star::uno::Reference< com::sun::star::io::XStream > mxTempFile;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::frame::XFrame > mxFrame;
+ css::uno::Reference< css::io::XStream > mxTempFile;
- com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener;
+ css::uno::Reference< css::awt::XActionListener > mxActionListener;
void InitDialog();
@@ -71,17 +71,17 @@ private :
public :
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame>& GetFrame() { return mxFrame; };
- const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxContext; };
+ css::uno::Reference< css::frame::XFrame>& GetFrame() { return mxFrame; };
+ const css::uno::Reference< css::uno::XComponentContext >& GetComponentContext() { return mxContext; };
};
-class OKActionListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XActionListener >
+class OKActionListener : public ::cppu::WeakImplHelper1< css::awt::XActionListener >
{
public:
OKActionListener( InformationDialog& rInformationDialog ) : mrInformationDialog( rInformationDialog ){};
- virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
InformationDialog& mrInformationDialog;
diff --git a/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx
index 51724c1..6ecb237 100644
--- a/sdext/source/minimizer/optimizationstats.hxx
+++ b/sdext/source/minimizer/optimizationstats.hxx
@@ -35,20 +35,20 @@ class OptimizationStats
return s1 < s2;
}
};
- std::map < PPPOptimizerTokenEnum, com::sun::star::uno::Any, Compare > maStats;
+ std::map < PPPOptimizerTokenEnum, css::uno::Any, Compare > maStats;
public :
OptimizationStats();
~OptimizationStats(){};
- void SetStatusValue( const PPPOptimizerTokenEnum eStat, const com::sun::star::uno::Any& rStatValue );
- const com::sun::star::uno::Any* GetStatusValue( const PPPOptimizerTokenEnum eStat ) const;
+ void SetStatusValue( const PPPOptimizerTokenEnum eStat, const css::uno::Any& rStatValue );
+ const css::uno::Any* GetStatusValue( const PPPOptimizerTokenEnum eStat ) const;
- void InitializeStatusValuesFromDocument( com::sun::star::uno::Reference< com::sun::star::frame::XModel > rxModel );
- void InitializeStatusValues( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rOptimizationStats );
+ void InitializeStatusValuesFromDocument( css::uno::Reference< css::frame::XModel > rxModel );
+ void InitializeStatusValues( const css::uno::Sequence< css::beans::PropertyValue >& rOptimizationStats );
- com::sun::star::beans::PropertyValues GetStatusSequence();
+ css::beans::PropertyValues GetStatusSequence();
};
diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx
index ec9e6b8..512c0f3 100644
--- a/sdext/source/minimizer/optimizerdialog.hxx
+++ b/sdext/source/minimizer/optimizerdialog.hxx
@@ -60,8 +60,8 @@ class OptimizerDialog : public UnoDialog, public ConfigurationAccess
{
public :
- OptimizerDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext, com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame,
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > rxStatusDispatcher );
+ OptimizerDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext, css::uno::Reference< css::frame::XFrame >& rxFrame,
+ css::uno::Reference< css::frame::XDispatch > rxStatusDispatcher );
~OptimizerDialog();
bool execute();
@@ -71,19 +71,19 @@ public :
bool mbIsReadonly;
private :
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::frame::XFrame > mxFrame;
- com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxRoadmapControl;
- com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxRoadmapControlModel;
+ css::uno::Reference< css::uno::XInterface > mxRoadmapControl;
+ css::uno::Reference< css::uno::XInterface > mxRoadmapControlModel;
- com::sun::star::uno::Reference< com::sun::star::awt::XItemListener > mxItemListener;
- com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListener;
- com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > mxActionListenerListBox0Pg0;
- com::sun::star::uno::Reference< com::sun::star::awt::XTextListener > mxTextListenerFormattedField0Pg1;
- com::sun::star::uno::Reference< com::sun::star::awt::XTextListener > mxTextListenerComboBox0Pg1;
- com::sun::star::uno::Reference< com::sun::star::awt::XSpinListener > mxSpinListenerFormattedField0Pg1;
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > mxStatusDispatcher;
+ css::uno::Reference< css::awt::XItemListener > mxItemListener;
+ css::uno::Reference< css::awt::XActionListener > mxActionListener;
+ css::uno::Reference< css::awt::XActionListener > mxActionListenerListBox0Pg0;
+ css::uno::Reference< css::awt::XTextListener > mxTextListenerFormattedField0Pg1;
+ css::uno::Reference< css::awt::XTextListener > mxTextListenerComboBox0Pg1;
+ css::uno::Reference< css::awt::XSpinListener > mxSpinListenerFormattedField0Pg1;
+ css::uno::Reference< css::frame::XDispatch > mxStatusDispatcher;
std::vector< std::vector< OUString > > maControlPages;
@@ -109,7 +109,7 @@ public :
OptimizationStats maStats;
- void UpdateStatus( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rStatus );
+ void UpdateStatus( const css::uno::Sequence< css::beans::PropertyValue >& rStatus );
// the ConfigurationAccess is updated to actual control settings
void UpdateConfiguration();
@@ -121,20 +121,20 @@ public :
void UpdateControlStates( sal_Int16 nStep = -1 );
OUString GetSelectedString( OUString const & token );
- com::sun::star::uno::Reference< com::sun::star::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; };
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame>& GetFrame() { return mxFrame; };
- const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& GetComponentContext() { return mxContext; };
+ css::uno::Reference< css::frame::XDispatch >& GetStatusDispatcher() { return mxStatusDispatcher; };
+ css::uno::Reference< css::frame::XFrame>& GetFrame() { return mxFrame; };
+ const css::uno::Reference< css::uno::XComponentContext >& GetComponentContext() { return mxContext; };
};
-class ItemListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XItemListener >
+class ItemListener : public ::cppu::WeakImplHelper1< css::awt::XItemListener >
{
public:
ItemListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
- virtual void SAL_CALL itemStateChanged( const ::com::sun::star::awt::ItemEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL itemStateChanged( const css::awt::ItemEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
OptimizerDialog& mrOptimizerDialog;
@@ -142,13 +142,13 @@ private:
-class ActionListener : public ::cppu::WeakImplHelper1< com::sun::star::awt::XActionListener >
+class ActionListener : public ::cppu::WeakImplHelper1< css::awt::XActionListener >
{
public:
ActionListener( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
- virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
OptimizerDialog& mrOptimizerDialog;
@@ -156,13 +156,13 @@ private:
-class ActionListenerListBox0Pg0 : public ::cppu::WeakImplHelper1< com::sun::star::awt::XActionListener >
+class ActionListenerListBox0Pg0 : public ::cppu::WeakImplHelper1< css::awt::XActionListener >
{
public:
ActionListenerListBox0Pg0( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
- virtual void SAL_CALL actionPerformed( const ::com::sun::star::awt::ActionEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL actionPerformed( const css::awt::ActionEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
OptimizerDialog& mrOptimizerDialog;
@@ -170,13 +170,13 @@ private:
-class TextListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper1< com::sun::star::awt::XTextListener >
+class TextListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper1< css::awt::XTextListener >
{
public:
TextListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
- virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
OptimizerDialog& mrOptimizerDialog;
@@ -184,13 +184,13 @@ private:
-class TextListenerComboBox0Pg1 : public ::cppu::WeakImplHelper1< com::sun::star::awt::XTextListener >
+class TextListenerComboBox0Pg1 : public ::cppu::WeakImplHelper1< css::awt::XTextListener >
{
public:
TextListenerComboBox0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
- virtual void SAL_CALL textChanged( const ::com::sun::star::awt::TextEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL textChanged( const css::awt::TextEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
OptimizerDialog& mrOptimizerDialog;
@@ -198,16 +198,16 @@ private:
-class SpinListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper1< com::sun::star::awt::XSpinListener >
+class SpinListenerFormattedField0Pg1 : public ::cppu::WeakImplHelper1< css::awt::XSpinListener >
{
public:
SpinListenerFormattedField0Pg1( OptimizerDialog& rOptimizerDialog ) : mrOptimizerDialog( rOptimizerDialog ){};
- virtual void SAL_CALL up( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL down( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL first( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL last( const ::com::sun::star::awt::SpinEvent& Event ) throw ( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw ( com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL up( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL down( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL first( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL last( const css::awt::SpinEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw ( css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
OptimizerDialog& mrOptimizerDialog;
diff --git a/sdext/source/minimizer/pagecollector.hxx b/sdext/source/minimizer/pagecollector.hxx
index 6f3ad0f..e10f7bd 100644
--- a/sdext/source/minimizer/pagecollector.hxx
+++ b/sdext/source/minimizer/pagecollector.hxx
@@ -30,12 +30,12 @@ class PageCollector
struct MasterPageEntity
{
- com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > xMasterPage;
+ css::uno::Reference< css::drawing::XDrawPage > xMasterPage;
bool bUsed;
};
- static void CollectCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const OUString& rCustomShow, std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > >& );
- static void CollectNonCustomShowPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, const OUString& rCustomShow, std::vector< com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > >& );
- static void CollectMasterPages( const com::sun::star::uno::Reference< com::sun::star::frame::XModel >&, std::vector< MasterPageEntity >& );
+ static void CollectCustomShowPages( const css::uno::Reference< css::frame::XModel >&, const OUString& rCustomShow, std::vector< css::uno::Reference< css::drawing::XDrawPage > >& );
+ static void CollectNonCustomShowPages( const css::uno::Reference< css::frame::XModel >&, const OUString& rCustomShow, std::vector< css::uno::Reference< css::drawing::XDrawPage > >& );
+ static void CollectMasterPages( const css::uno::Reference< css::frame::XModel >&, std::vector< MasterPageEntity >& );
};
#endif // INCLUDED_SDEXT_SOURCE_MINIMIZER_PAGECOLLECTOR_HXX
diff --git a/sdext/source/minimizer/pppoptimizer.hxx b/sdext/source/minimizer/pppoptimizer.hxx
index c9121eb..0b92962 100644
--- a/sdext/source/minimizer/pppoptimizer.hxx
+++ b/sdext/source/minimizer/pppoptimizer.hxx
@@ -32,11 +32,11 @@
class PPPOptimizer : public cppu::WeakImplHelper2<
- com::sun::star::frame::XDispatchProvider,
- com::sun::star::frame::XDispatch >
+ css::frame::XDispatchProvider,
+ css::frame::XDispatch >
{
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
- com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::frame::XController > mxController;
public:
@@ -46,24 +46,24 @@ public:
virtual ~PPPOptimizer();
// XDispatchProvider
- virtual com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(
- const com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
- throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
+ const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches(
- const com::sun::star::uno::Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(
+ const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XDispatch
- virtual void SAL_CALL dispatch( const com::sun::star::util::URL& aURL,
- const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& lArguments )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL dispatch( const css::util::URL& aURL,
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL addStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener,
- const com::sun::star::util::URL& aURL )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL removeStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener,
- const com::sun::star::util::URL& aURL )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener,
+ const css::util::URL& aURL )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener,
+ const css::util::URL& aURL )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
static sal_Int64 GetFileSize( const OUString& rURL );
};
diff --git a/sdext/source/minimizer/pppoptimizerdialog.hxx b/sdext/source/minimizer/pppoptimizerdialog.hxx
index c6b1f45..503b553 100644
--- a/sdext/source/minimizer/pppoptimizerdialog.hxx
+++ b/sdext/source/minimizer/pppoptimizerdialog.hxx
@@ -40,61 +40,61 @@
class OptimizerDialog;
class PPPOptimizerDialog : public ::cppu::WeakImplHelper4<
- com::sun::star::lang::XInitialization,
- com::sun::star::lang::XServiceInfo,
- com::sun::star::frame::XDispatchProvider,
- com::sun::star::frame::XDispatch >
+ css::lang::XInitialization,
+ css::lang::XServiceInfo,
+ css::frame::XDispatchProvider,
+ css::frame::XDispatch >
{
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
- com::sun::star::uno::Reference< com::sun::star::frame::XFrame > mxFrame;
- com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::frame::XFrame > mxFrame;
+ css::uno::Reference< css::frame::XController > mxController;
OptimizerDialog* mpOptimizerDialog;
public:
- PPPOptimizerDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
+ PPPOptimizerDialog( const css::uno::Reference< css::uno::XComponentContext >& xContext );
virtual ~PPPOptimizerDialog();
// XInitialization
- void SAL_CALL initialize( const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArguments )
- throw( com::sun::star::uno::Exception, com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments )
+ throw( css::uno::Exception, css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames()
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XDispatchProvider
- virtual com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > SAL_CALL queryDispatch(
- const com::sun::star::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
- throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual css::uno::Reference< css::frame::XDispatch > SAL_CALL queryDispatch(
+ const css::util::URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags )
+ throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > > SAL_CALL queryDispatches(
- const com::sun::star::uno::Sequence< com::sun::star::frame::DispatchDescriptor >& aDescripts ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(
+ const css::uno::Sequence< css::frame::DispatchDescriptor >& aDescripts ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XDispatch
- virtual void SAL_CALL dispatch( const com::sun::star::util::URL& aURL,
- const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& lArguments )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
-
- virtual void SAL_CALL addStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener,
- const com::sun::star::util::URL& aURL )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- virtual void SAL_CALL removeStatusListener( const com::sun::star::uno::Reference< com::sun::star::frame::XStatusListener >& xListener,
- const com::sun::star::util::URL& aURL )
- throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL dispatch( const css::util::URL& aURL,
+ const css::uno::Sequence< css::beans::PropertyValue >& lArguments )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+
+ virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener,
+ const css::util::URL& aURL )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener,
+ const css::util::URL& aURL )
+ throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
};
OUString PPPOptimizerDialog_getImplementationName();
-com::sun::star::uno::Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames();
-com::sun::star::uno::Reference< com::sun::star::uno::XInterface > PPPOptimizerDialog_createInstance( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > & rSMgr )
- throw( com::sun::star::uno::Exception );
+css::uno::Sequence< OUString > PPPOptimizerDialog_getSupportedServiceNames();
+css::uno::Reference< css::uno::XInterface > PPPOptimizerDialog_createInstance( const css::uno::Reference< css::uno::XComponentContext > & rSMgr )
+ throw( css::uno::Exception );
diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx
index 5d6750e..e0e58ab 100644
--- a/sdext/source/minimizer/unodialog.hxx
+++ b/sdext/source/minimizer/unodialog.hxx
@@ -62,67 +62,67 @@ class UnoDialog
{
public :
- UnoDialog( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxMSF, com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rxFrame );
+ UnoDialog( const css::uno::Reference< css::uno::XComponentContext >& rxMSF, css::uno::Reference< css::frame::XFrame >& rxFrame );
~UnoDialog();
void execute();
void endExecute( bool bStatus );
- com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > createWindowPeer( com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > xParentPeer )
- throw ( com::sun::star::uno::Exception );
+ css::uno::Reference< css::awt::XWindowPeer > createWindowPeer( css::uno::Reference< css::awt::XWindowPeer > xParentPeer )
+ throw ( css::uno::Exception );
- com::sun::star::uno::Reference< com::sun::star::uno::XInterface > insertControlModel( const OUString& rServiceName, const OUString& rName,
- const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues );
+ css::uno::Reference< css::uno::XInterface > insertControlModel( const OUString& rServiceName, const OUString& rName,
+ const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& rPropertyValues );
void setVisible( const OUString& rName, bool bVisible );
- com::sun::star::uno::Reference< com::sun::star::awt::XButton > insertButton( const OUString& rName,
- com::sun::star::uno::Reference< com::sun::star::awt::XActionListener > xActionListener, const com::sun::star::uno::Sequence< OUString >& rPropertyNames,
- const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues );
+ css::uno::Reference< css::awt::XButton > insertButton( const OUString& rName,
+ css::uno::Reference< css::awt::XActionListener > xActionListener, const css::uno::Sequence< OUString >& rPropertyNames,
+ const css::uno::Sequence< css::uno::Any >& rPropertyValues );
- com::sun::star::uno::Reference< com::sun::star::awt::XFixedText > insertFixedText( const OUString& rName,
- const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues );
+ css::uno::Reference< css::awt::XFixedText > insertFixedText( const OUString& rName,
+ const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& rPropertyValues );
- com::sun::star::uno::Reference< com::sun::star::awt::XCheckBox > insertCheckBox( const OUString& rName,
- const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues );
+ css::uno::Reference< css::awt::XCheckBox > insertCheckBox( const OUString& rName,
+ const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& rPropertyValues );
- com::sun::star::uno::Reference< com::sun::star::awt::XControl > insertFormattedField( const OUString& rName,
- const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues );
+ css::uno::Reference< css::awt::XControl > insertFormattedField( const OUString& rName,
+ const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& rPropertyValues );
- com::sun::star::uno::Reference< com::sun::star::awt::XComboBox > insertComboBox( const OUString& rName,
- const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues );
+ css::uno::Reference< css::awt::XComboBox > insertComboBox( const OUString& rName,
+ const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& rPropertyValues );
- com::sun::star::uno::Reference< com::sun::star::awt::XRadioButton > insertRadioButton( const OUString& rName,
- const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues );
+ css::uno::Reference< css::awt::XRadioButton > insertRadioButton( const OUString& rName,
+ const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& rPropertyValues );
- com::sun::star::uno::Reference< com::sun::star::awt::XListBox > insertListBox( const OUString& rName,
- const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues );
+ css::uno::Reference< css::awt::XListBox > insertListBox( const OUString& rName,
+ const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& rPropertyValues );
- com::sun::star::uno::Reference< com::sun::star::awt::XControl > insertImage( const OUString& rName,
- const com::sun::star::uno::Sequence< OUString >& rPropertyNames, const com::sun::star::uno::Sequence< com::sun::star::uno::Any >& rPropertyValues );
+ css::uno::Reference< css::awt::XControl > insertImage( const OUString& rName,
+ const css::uno::Sequence< OUString >& rPropertyNames, const css::uno::Sequence< css::uno::Any >& rPropertyValues );
- void setControlProperty( const OUString& rControlName, const OUString& rPropertyName, const com::sun::star::uno::Any& rPropertyValue );
- com::sun::star::uno::Any getControlProperty( const OUString& rControlName, const OUString& rPropertyName );
+ void setControlProperty( const OUString& rControlName, const OUString& rPropertyName, const css::uno::Any& rPropertyValue );
+ css::uno::Any getControlProperty( const OUString& rControlName, const OUString& rPropertyName );
void enableControl( const OUString& rControlName );
void disableControl( const OUString& rControlName );
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
- com::sun::star::uno::Reference< com::sun::star::frame::XController > mxController;
- com::sun::star::uno::Reference< com::sun::star::awt::XReschedule > mxReschedule;
+ css::uno::Reference< css::uno::XComponentContext > mxContext;
+ css::uno::Reference< css::frame::XController > mxController;
+ css::uno::Reference< css::awt::XReschedule > mxReschedule;
- com::sun::star::uno::Reference< com::sun::star::uno::XInterface > mxDialogModel;
- com::sun::star::uno::Reference< com::sun::star::beans::XMultiPropertySet > mxDialogModelMultiPropertySet;
- com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > mxDialogModelPropertySet;
- com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxDialogModelMSF;
- com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > mxDialogModelNameContainer;
- com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > mxDialogModelNameAccess;
+ css::uno::Reference< css::uno::XInterface > mxDialogModel;
+ css::uno::Reference< css::beans::XMultiPropertySet > mxDialogModelMultiPropertySet;
+ css::uno::Reference< css::beans::XPropertySet > mxDialogModelPropertySet;
+ css::uno::Reference< css::lang::XMultiServiceFactory > mxDialogModelMSF;
+ css::uno::Reference< css::container::XNameContainer > mxDialogModelNameContainer;
+ css::uno::Reference< css::container::XNameAccess > mxDialogModelNameAccess;
- com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > mxControlModel;
+ css::uno::Reference< css::awt::XControlModel > mxControlModel;
- com::sun::star::uno::Reference< com::sun::star::awt::XUnoControlDialog > mxDialog;
- com::sun::star::uno::Reference< com::sun::star::awt::XControl > mxControl;
- com::sun::star::uno::Reference< com::sun::star::awt::XWindowPeer > mxWindowPeer;
+ css::uno::Reference< css::awt::XUnoControlDialog > mxDialog;
+ css::uno::Reference< css::awt::XControl > mxControl;
+ css::uno::Reference< css::awt::XWindowPeer > mxWindowPeer;
bool mbStatus;
};
diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx
index 75b5808..6a5c59f 100644
--- a/sdext/source/pdfimport/filterdet.hxx
+++ b/sdext/source/pdfimport/filterdet.hxx
@@ -34,23 +34,23 @@ namespace pdfi
{
typedef ::cppu::WeakComponentImplHelper1<
- com::sun::star::document::XExtendedFilterDetection > PDFDetectorBase;
+ css::document::XExtendedFilterDetection > PDFDetectorBase;
class PDFDetector : private cppu::BaseMutex,
public PDFDetectorBase
{
private:
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference<
+ css::uno::XComponentContext > m_xContext;
public:
- explicit PDFDetector( const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& xContext );
+ explicit PDFDetector( const css::uno::Reference<
+ css::uno::XComponentContext >& xContext );
// XExtendedFilterDetection
- virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<
- com::sun::star::beans::PropertyValue >& io_rDescriptor )
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual OUString SAL_CALL detect( css::uno::Sequence<
+ css::beans::PropertyValue >& io_rDescriptor )
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
};
@@ -81,12 +81,12 @@ public:
When false, no dialog is opened to query user for alternate
password
*/
-com::sun::star::uno::Reference< com::sun::star::io::XStream >
+css::uno::Reference< css::io::XStream >
getAdditionalStream( const OUString& rPDFFile,
OUString& o_rOutMimetype,
OUString& io_rOutPwd,
- const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext,
- const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rFilterData,
+ const css::uno::Reference< css::uno::XComponentContext >& xContext,
+ const css::uno::Sequence< css::beans::PropertyValue >& rFilterData,
bool bMayUseUI );
@@ -94,7 +94,7 @@ bool checkDocChecksum( const OUString& rInPDFFileURL,
sal_uInt32 nBytes,
const OUString& rChkSum );
-bool getPassword( const com::sun::star::uno::Reference< com::sun::star::task::XInteractionHandler >& xHandler,
+bool getPassword( const css::uno::Reference< css::task::XInteractionHandler >& xHandler,
OUString& o_rPwd,
bool bFirstTry,
const OUString& i_rDocName
diff --git a/sdext/source/pdfimport/inc/contentsink.hxx b/sdext/source/pdfimport/inc/contentsink.hxx
index 67e2006..93ae5ad 100644
--- a/sdext/source/pdfimport/inc/contentsink.hxx
+++ b/sdext/source/pdfimport/inc/contentsink.hxx
@@ -99,73 +99,73 @@ namespace pdfi
/// Total number of pages for upcoming document
virtual void setPageNum( sal_Int32 nNumPages ) = 0;
- virtual void startPage( const ::com::sun::star::geometry::RealSize2D& rSize ) = 0;
+ virtual void startPage( const css::geometry::RealSize2D& rSize ) = 0;
virtual void endPage() = 0;
- virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds,
+ virtual void hyperLink( const css::geometry::RealRectangle2D& rBounds,
const OUString& rURI ) = 0;
virtual void pushState() = 0;
virtual void popState() = 0;
virtual void setFlatness( double ) = 0;
- virtual void setTransformation( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix ) = 0;
- virtual void setLineDash( const ::com::sun::star::uno::Sequence<double>& dashes,
+ virtual void setTransformation( const css::geometry::AffineMatrix2D& rMatrix ) = 0;
+ virtual void setLineDash( const css::uno::Sequence<double>& dashes,
double start ) = 0;
virtual void setLineJoin( sal_Int8 lineJoin ) = 0;
virtual void setLineCap( sal_Int8 lineCap ) = 0;
virtual void setMiterLimit(double) = 0;
virtual void setLineWidth(double) = 0;
- virtual void setFillColor( const ::com::sun::star::rendering::ARGBColor& rColor ) = 0;
- virtual void setStrokeColor( const ::com::sun::star::rendering::ARGBColor& rColor ) = 0;
+ virtual void setFillColor( const css::rendering::ARGBColor& rColor ) = 0;
+ virtual void setStrokeColor( const css::rendering::ARGBColor& rColor ) = 0;
virtual void setBlendMode( sal_Int8 blendMode ) = 0;
virtual void setFont( const FontAttributes& rFont ) = 0;
virtual void setTextRenderMode( sal_Int32 ) = 0;
- virtual void strokePath( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0;
- virtual void fillPath( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0;
- virtual void eoFillPath( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) = 0;
+ virtual void strokePath( const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPath ) = 0;
+ virtual void fillPath( const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPath ) = 0;
+ virtual void eoFillPath( const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPath ) = 0;
- virtual void intersectClip(const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0;
- virtual void intersectEoClip(const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath) = 0;
+ virtual void intersectClip(const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPath) = 0;
+ virtual void intersectEoClip(const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPath) = 0;
virtual void drawGlyphs( const OUString& rGlyphs,
- const ::com::sun::star::geometry::RealRectangle2D& rRect,
- const ::com::sun::star::geometry::Matrix2D& rFontMatrix ) = 0;
+ const css::geometry::RealRectangle2D& rRect,
+ const css::geometry::Matrix2D& rFontMatrix ) = 0;
/// issued when a sequence of associated glyphs is drawn
virtual void endText() = 0;
/// draws given bitmap as a mask (using current fill color)
- virtual void drawMask(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xBitmap,
+ virtual void drawMask(const css::uno::Sequence<
+ css::beans::PropertyValue>& xBitmap,
bool bInvert ) = 0;
/// Given image must already be color-mapped and normalized to sRGB.
- virtual void drawImage(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xBitmap ) = 0;
+ virtual void drawImage(const css::uno::Sequence<
+ css::beans::PropertyValue>& xBitmap ) = 0;
/** Given image must already be color-mapped and normalized to sRGB.
maskColors must contain two sequences of color components
*/
- virtual void drawColorMaskedImage(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xBitmap,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any>& xMaskColors ) = 0;
- virtual void drawMaskedImage(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xBitmap,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xMask,
+ virtual void drawColorMaskedImage(const css::uno::Sequence<
+ css::beans::PropertyValue>& xBitmap,
+ const css::uno::Sequence<
+ css::uno::Any>& xMaskColors ) = 0;
+ virtual void drawMaskedImage(const css::uno::Sequence<
+ css::beans::PropertyValue>& xBitmap,
+ const css::uno::Sequence<
+ css::beans::PropertyValue>& xMask,
bool bInvertMask) = 0;
- virtual void drawAlphaMaskedImage(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xImage,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xMask) = 0;
+ virtual void drawAlphaMaskedImage(const css::uno::Sequence<
+ css::beans::PropertyValue>& xImage,
+ const css::uno::Sequence<
+ css::beans::PropertyValue>& xMask) = 0;
};
typedef boost::shared_ptr<ContentSink> ContentSinkSharedPtr;
diff --git a/sdext/source/pdfimport/inc/odfemitter.hxx b/sdext/source/pdfimport/inc/odfemitter.hxx
index 61fb8d2..2a18c30 100644
--- a/sdext/source/pdfimport/inc/odfemitter.hxx
+++ b/sdext/source/pdfimport/inc/odfemitter.hxx
@@ -30,8 +30,8 @@ namespace com { namespace sun { namespace star { namespace io
namespace pdfi
{
- XmlEmitterSharedPtr createOdfEmitter( const com::sun::star::uno::Reference<
- com::sun::star::io::XOutputStream>& xOut );
+ XmlEmitterSharedPtr createOdfEmitter( const css::uno::Reference<
+ css::io::XOutputStream>& xOut );
}
#endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_ODFEMITTER_HXX
diff --git a/sdext/source/pdfimport/inc/pdfihelper.hxx b/sdext/source/pdfimport/inc/pdfihelper.hxx
index b5c9b8c..8fe8410 100644
--- a/sdext/source/pdfimport/inc/pdfihelper.hxx
+++ b/sdext/source/pdfimport/inc/pdfihelper.hxx
@@ -71,7 +71,7 @@ namespace pdfi
}
/// Convert color to "#FEFEFE" color notation
- OUString getColorString( const ::com::sun::star::rendering::ARGBColor& );
+ OUString getColorString( const css::rendering::ARGBColor& );
OUString getPercentString(double value);
double GetAverageTransformationScale(const basegfx::B2DHomMatrix& matrix);
@@ -93,8 +93,8 @@ namespace pdfi
struct GraphicsContext
{
- ::com::sun::star::rendering::ARGBColor LineColor;
- ::com::sun::star::rendering::ARGBColor FillColor;
+ css::rendering::ARGBColor LineColor;
+ css::rendering::ARGBColor FillColor;
sal_Int8 LineJoin;
sal_Int8 LineCap;
sal_Int8 BlendMode;
@@ -151,11 +151,11 @@ namespace pdfi
switch (LineJoin)
{
default:
- case ::com::sun::star::rendering::PathJoinType::MITER:
+ case css::rendering::PathJoinType::MITER:
return OUString("miter");
- case ::com::sun::star::rendering::PathJoinType::ROUND:
+ case css::rendering::PathJoinType::ROUND:
return OUString("round");
- case ::com::sun::star::rendering::PathJoinType::BEVEL:
+ case css::rendering::PathJoinType::BEVEL:
return OUString("bevel");
}
}
@@ -165,11 +165,11 @@ namespace pdfi
switch (LineCap)
{
default:
- case ::com::sun::star::rendering::PathCapType::BUTT:
+ case css::rendering::PathCapType::BUTT:
return OUString("butt");
- case ::com::sun::star::rendering::PathCapType::ROUND:
+ case css::rendering::PathCapType::ROUND:
return OUString("round");
- case ::com::sun::star::rendering::PathCapType::SQUARE:
+ case css::rendering::PathCapType::SQUARE:
return OUString("square");
}
}
@@ -213,16 +213,16 @@ namespace pdfi
/** retrieve password from user
*/
- bool getPassword( const ::com::sun::star::uno::Reference<
- ::com::sun::star::task::XInteractionHandler >& xHandler,
+ bool getPassword( const css::uno::Reference<
+ css::task::XInteractionHandler >& xHandler,
OUString& rOutPwd,
bool bFirstTry,
const OUString& rDocName
);
void reportUnsupportedEncryptionFormat(
- com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionHandler > const & handler);
+ css::uno::Reference<
+ css::task::XInteractionHandler > const & handler);
}
#endif
diff --git a/sdext/source/pdfimport/inc/saxemitter.hxx b/sdext/source/pdfimport/inc/saxemitter.hxx
index 6953037..b097442 100644
--- a/sdext/source/pdfimport/inc/saxemitter.hxx
+++ b/sdext/source/pdfimport/inc/saxemitter.hxx
@@ -31,8 +31,8 @@ namespace sax
namespace pdfi
{
- XmlEmitterSharedPtr createSaxEmitter( const com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler >& xDocHdl );
+ XmlEmitterSharedPtr createSaxEmitter( const css::uno::Reference<
+ css::xml::sax::XDocumentHandler >& xDocHdl );
}
#endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_SAXEMITTER_HXX
diff --git a/sdext/source/pdfimport/inc/wrapper.hxx b/sdext/source/pdfimport/inc/wrapper.hxx
index 59de61f..8f0fc10 100644
--- a/sdext/source/pdfimport/inc/wrapper.hxx
+++ b/sdext/source/pdfimport/inc/wrapper.hxx
@@ -36,19 +36,19 @@ namespace pdfi
{
bool xpdf_ImportFromFile( const OUString& rURL,
const ContentSinkSharedPtr& rSink,
- const com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionHandler >& xIHdl,
+ const css::uno::Reference<
+ css::task::XInteractionHandler >& xIHdl,
const OUString& rPwd,
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >& xContext );
- bool xpdf_ImportFromStream( const com::sun::star::uno::Reference<
- com::sun::star::io::XInputStream >& xInput,
+ const css::uno::Reference<
+ css::uno::XComponentContext >& xContext );
+ bool xpdf_ImportFromStream( const css::uno::Reference<
+ css::io::XInputStream >& xInput,
const ContentSinkSharedPtr& rSink,
- const com::sun::star::uno::Reference<
- com::sun::star::task::XInteractionHandler >& xIHdl,
+ const css::uno::Reference<
+ css::task::XInteractionHandler >& xIHdl,
const OUString& rPwd,
- const com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext >& xContext );
+ const css::uno::Reference<
+ css::uno::XComponentContext >& xContext );
}
#endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_INC_WRAPPER_HXX
diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx
index 7276d08..a88f3df 100644
--- a/sdext/source/pdfimport/pdfiadaptor.hxx
+++ b/sdext/source/pdfimport/pdfiadaptor.hxx
@@ -40,35 +40,35 @@
namespace pdfi
{
typedef ::cppu::WeakComponentImplHelper2<
- com::sun::star::document::XFilter,
- com::sun::star::document::XImporter > PDFIHybridAdaptorBase;
+ css::document::XFilter,
+ css::document::XImporter > PDFIHybridAdaptorBase;
class PDFIHybridAdaptor : private cppu::BaseMutex,
public PDFIHybridAdaptorBase
{
private:
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > m_xContext;
- com::sun::star::uno::Reference<
- com::sun::star::frame::XModel > m_xModel;
+ css::uno::Reference<
+ css::uno::XComponentContext > m_xContext;
+ css::uno::Reference<
+ css::frame::XModel > m_xModel;
public:
- explicit PDFIHybridAdaptor( const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& xContext );
+ explicit PDFIHybridAdaptor( const css::uno::Reference<
+ css::uno::XComponentContext >& xContext );
// XFilter
- virtual sal_Bool SAL_CALL filter( const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& rFilterData ) throw(com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL filter( const css::uno::Sequence<css::beans::PropertyValue>& rFilterData ) throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL cancel() throw(std::exception) SAL_OVERRIDE;
// XImporter
- virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument )
- throw( com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument )
+ throw( css::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE;
};
typedef ::cppu::WeakComponentImplHelper2<
- com::sun::star::xml::XImportFilter,
- com::sun::star::document::XImporter > PDFIAdaptorBase;
+ css::xml::XImportFilter,
+ css::document::XImporter > PDFIAdaptorBase;
/** Adapts raw pdf import to XImportFilter interface
*/
@@ -76,23 +76,23 @@ namespace pdfi
public PDFIAdaptorBase
{
private:
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > m_xContext;
- com::sun::star::uno::Reference<
- com::sun::star::frame::XModel > m_xModel;
+ css::uno::Reference<
+ css::uno::XComponentContext > m_xContext;
+ css::uno::Reference<
+ css::frame::XModel > m_xModel;
TreeVisitorFactorySharedPtr m_pVisitorFactory;
bool m_bEnableToplevelText;
- bool parse( const com::sun::star::uno::Reference<com::sun::star::io::XInputStream>& xInput,
- const com::sun::star::uno::Reference<com::sun::star::task::XInteractionHandler>& xIHdl,
+ bool parse( const css::uno::Reference<css::io::XInputStream>& xInput,
+ const css::uno::Reference<css::task::XInteractionHandler>& xIHdl,
const OUString& rPwd,
- const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& xStatus,
+ const css::uno::Reference<css::task::XStatusIndicator>& xStatus,
const XmlEmitterSharedPtr& rEmitter,
const OUString& rURL );
public:
- explicit PDFIRawAdaptor( const ::com::sun::star::uno::Reference<
- ::com::sun::star::uno::XComponentContext >& xContext );
+ explicit PDFIRawAdaptor( const css::uno::Reference<
+ css::uno::XComponentContext >& xContext );
/** Set factory object used to create the tree visitors
@@ -113,17 +113,17 @@ namespace pdfi
Optional status indicator
*/
bool odfConvert( const OUString& rURL,
- const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream>& xOutput,
- const com::sun::star::uno::Reference<com::sun::star::task::XStatusIndicator>& xStatus );
+ const css::uno::Reference<css::io::XOutputStream>& xOutput,
+ const css::uno::Reference<css::task::XStatusIndicator>& xStatus );
// XImportFilter
- virtual sal_Bool SAL_CALL importer( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rSourceData,
- const com::sun::star::uno::Reference< com::sun::star::xml::sax::XDocumentHandler >& rHdl,
- const com::sun::star::uno::Sequence< OUString >& rUserData ) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
+ virtual sal_Bool SAL_CALL importer( const css::uno::Sequence< css::beans::PropertyValue >& rSourceData,
+ const css::uno::Reference< css::xml::sax::XDocumentHandler >& rHdl,
+ const css::uno::Sequence< OUString >& rUserData ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
// XImporter
- virtual void SAL_CALL setTargetDocument( const com::sun::star::uno::Reference< com::sun::star::lang::XComponent >& xDocument )
- throw( com::sun::star::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE;
+ virtual void SAL_CALL setTargetDocument( const css::uno::Reference< css::lang::XComponent >& xDocument )
+ throw( css::lang::IllegalArgumentException, std::exception ) SAL_OVERRIDE;
};
}
diff --git a/sdext/source/pdfimport/sax/emitcontext.hxx b/sdext/source/pdfimport/sax/emitcontext.hxx
index 677952c..a93d904 100644
--- a/sdext/source/pdfimport/sax/emitcontext.hxx
+++ b/sdext/source/pdfimport/sax/emitcontext.hxx
@@ -32,12 +32,12 @@ namespace pdfi
class SaxEmitter : public XmlEmitter
{
private:
- com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler > m_xDocHdl;
+ css::uno::Reference<
+ css::xml::sax::XDocumentHandler > m_xDocHdl;
public:
- explicit SaxEmitter( const com::sun::star::uno::Reference<
- com::sun::star::xml::sax::XDocumentHandler >& xDocHdl );
+ explicit SaxEmitter( const css::uno::Reference<
+ css::xml::sax::XDocumentHandler >& xDocHdl );
virtual ~SaxEmitter();
virtual void beginTag( const char* pTag, const PropertyMap& rProperties ) SAL_OVERRIDE;
diff --git a/sdext/source/pdfimport/sax/saxattrlist.hxx b/sdext/source/pdfimport/sax/saxattrlist.hxx
index 8b84944..eee4d95 100644
--- a/sdext/source/pdfimport/sax/saxattrlist.hxx
+++ b/sdext/source/pdfimport/sax/saxattrlist.hxx
@@ -31,8 +31,8 @@
namespace pdfi
{
class SaxAttrList : public ::cppu::WeakImplHelper2<
- com::sun::star::xml::sax::XAttributeList,
- com::sun::star::util::XCloneable
+ css::xml::sax::XAttributeList,
+ css::util::XCloneable
>
{
struct AttrEntry
@@ -52,7 +52,7 @@ namespace pdfi
SaxAttrList( const SaxAttrList& );
virtual ~SaxAttrList();
- // ::com::sun::star::xml::sax::XAttributeList
+ // css::xml::sax::XAttributeList
virtual sal_Int16 SAL_CALL getLength() throw(std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getNameByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getTypeByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE;
@@ -60,8 +60,8 @@ namespace pdfi
virtual OUString SAL_CALL getValueByIndex(sal_Int16 i) throw(std::exception) SAL_OVERRIDE;
virtual OUString SAL_CALL getValueByName(const OUString& aName) throw(std::exception) SAL_OVERRIDE;
- // ::com::sun::star::util::XCloneable
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone() throw(std::exception) SAL_OVERRIDE;
+ // css::util::XCloneable
+ virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw(std::exception) SAL_OVERRIDE;
};
}
diff --git a/sdext/source/pdfimport/test/outputwrap.hxx b/sdext/source/pdfimport/test/outputwrap.hxx
index 1857c20..2f4ccd1 100644
--- a/sdext/source/pdfimport/test/outputwrap.hxx
+++ b/sdext/source/pdfimport/test/outputwrap.hxx
@@ -30,7 +30,7 @@ namespace pdfi
{
typedef ::cppu::WeakComponentImplHelper1<
- com::sun::star::io::XOutputStream > OutputWrapBase;
+ css::io::XOutputStream > OutputWrapBase;
class OutputWrap : private cppu::BaseMutex, public OutputWrapBase
{
@@ -43,18 +43,18 @@ typedef ::cppu::WeakComponentImplHelper1<
maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write);
}
- virtual void SAL_CALL writeBytes( const com::sun::star::uno::Sequence< ::sal_Int8 >& aData ) throw (com::sun::star::io::NotConnectedException,com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL writeBytes( const css::uno::Sequence< ::sal_Int8 >& aData ) throw (css::io::NotConnectedException,css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
sal_uInt64 nBytesWritten(0);
maFile.write(aData.getConstArray(),aData.getLength(),nBytesWritten);
}
- virtual void SAL_CALL flush() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL flush() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
}
- virtual void SAL_CALL closeOutput() throw (com::sun::star::io::NotConnectedException, com::sun::star::io::BufferSizeExceededException, com::sun::star::io::IOException, com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE
+ virtual void SAL_CALL closeOutput() throw (css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) SAL_OVERRIDE
{
maFile.close();
}
diff --git a/sdext/source/pdfimport/tree/drawtreevisiting.hxx b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
index 2bd8a5a..78e146f 100644
--- a/sdext/source/pdfimport/tree/drawtreevisiting.hxx
+++ b/sdext/source/pdfimport/tree/drawtreevisiting.hxx
@@ -38,8 +38,8 @@ namespace pdfi
void optimizeTextElements(Element& rParent);
public:
- ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > mxBreakIter;
- const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator >& GetBreakIterator();
+ css::uno::Reference< css::i18n::XBreakIterator > mxBreakIter;
+ const css::uno::Reference< css::i18n::XBreakIterator >& GetBreakIterator();
explicit DrawXmlOptimizer(PDFIProcessor& rProcessor) :
m_rProcessor(rProcessor)
{}
@@ -80,10 +80,10 @@ namespace pdfi
class DrawXmlEmitter : public ElementTreeVisitor
{
private:
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xFactory;
- ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xCtx;
- ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XBreakIterator > mxBreakIter;
- ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > mxCharClass;
+ css::uno::Reference< css::lang::XMultiServiceFactory > xFactory;
+ css::uno::Reference< css::uno::XComponentContext > xCtx;
+ css::uno::Reference< css::i18n::XBreakIterator > mxBreakIter;
+ css::uno::Reference< css::i18n::XCharacterClassification > mxCharClass;
PDFIProcessor& m_rProcessor;
@@ -98,7 +98,7 @@ namespace pdfi
);
public:
- const ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification >& GetCharacterClassification();
+ const css::uno::Reference< css::i18n::XCharacterClassification >& GetCharacterClassification();
enum DocType{ DRAW_DOC, IMPRESS_DOC };
explicit DrawXmlEmitter(EmitContext& rEmitContext, DocType eDocType, PDFIProcessor& rProc ) :
m_rProcessor( rProc ),
diff --git a/sdext/source/pdfimport/tree/genericelements.hxx b/sdext/source/pdfimport/tree/genericelements.hxx
index 1aedb15..ae8e5f1 100644
--- a/sdext/source/pdfimport/tree/genericelements.hxx
+++ b/sdext/source/pdfimport/tree/genericelements.hxx
@@ -48,9 +48,9 @@ namespace pdfi
StyleContainer& _rStyles,
ImageContainer& _rImages,
PDFIProcessor& _rProcessor,
- const com::sun::star::uno::Reference<
- com::sun::star::task::XStatusIndicator>& _xStatusIndicator,
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext)
+ const css::uno::Reference<
+ css::task::XStatusIndicator>& _xStatusIndicator,
+ css::uno::Reference< css::uno::XComponentContext > xContext)
:
rEmitter(_rEmitter),
rStyles(_rStyles),
@@ -64,10 +64,10 @@ namespace pdfi
StyleContainer& rStyles;
ImageContainer& rImages;
PDFIProcessor& rProcessor;
- com::sun::star::uno::Reference<
- com::sun::star::task::XStatusIndicator> xStatusIndicator;
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference<
+ css::task::XStatusIndicator> xStatusIndicator;
+ css::uno::Reference<
+ css::uno::XComponentContext > m_xContext;
};
struct Element : public ElementTreeVisitable
diff --git a/sdext/source/pdfimport/tree/imagecontainer.hxx b/sdext/source/pdfimport/tree/imagecontainer.hxx
index 45bd553..5cee893 100644
--- a/sdext/source/pdfimport/tree/imagecontainer.hxx
+++ b/sdext/source/pdfimport/tree/imagecontainer.hxx
@@ -36,14 +36,14 @@ namespace pdfi
class ImageContainer
{
private:
- std::vector< ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue> > m_aImages;
+ std::vector< css::uno::Sequence<
+ css::beans::PropertyValue> > m_aImages;
public:
ImageContainer();
- ImageId addImage( const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xBitmap );
+ ImageId addImage( const css::uno::Sequence<
+ css::beans::PropertyValue>& xBitmap );
void writeBase64EncodedStream( ImageId nImageId, EmitContext& rContext );
};
}
diff --git a/sdext/source/pdfimport/tree/pdfiprocessor.hxx b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
index 81ef37b..6125d19 100644
--- a/sdext/source/pdfimport/tree/pdfiprocessor.hxx
+++ b/sdext/source/pdfimport/tree/pdfiprocessor.hxx
@@ -64,14 +64,14 @@ namespace pdfi
class PDFIProcessor : public ContentSink
{
public:
- com::sun::star::uno::Reference<
- com::sun::star::uno::XComponentContext > m_xContext;
+ css::uno::Reference<
+ css::uno::XComponentContext > m_xContext;
basegfx::B2DHomMatrix prevTextMatrix;
double prevCharWidth;
enum DocumentTextDirecion { LrTb, RlTb, TbLr };
- explicit PDFIProcessor( const com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator >& xStat,
- com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > xContext) ;
+ explicit PDFIProcessor( const css::uno::Reference< css::task::XStatusIndicator >& xStat,
+ css::uno::Reference< css::uno::XComponentContext > xContext) ;
/// TEMP - enable writer-like text:p on doc level
void enableToplevelText();
@@ -87,9 +87,9 @@ namespace pdfi
ImageContainer& getImages() { return m_aImages; }
boost::shared_ptr<ElementFactory> getElementFactory() const { return m_pElFactory; }
- const com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator >& getStatusIndicator() const
+ const css::uno::Reference< css::task::XStatusIndicator >& getStatusIndicator() const
{ return m_xStatusIndicator; }
- void setStatusIndicator( const com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator >& xStatus )
+ void setStatusIndicator( const css::uno::Reference< css::task::XStatusIndicator >& xStatus )
{ m_xStatusIndicator = xStatus; }
const FontAttributes& getFont( sal_Int32 nFontId ) const;
@@ -105,67 +105,67 @@ namespace pdfi
// ContentSink interface implementation
virtual void setPageNum( sal_Int32 nNumPages ) SAL_OVERRIDE;
- virtual void startPage( const ::com::sun::star::geometry::RealSize2D& rSize ) SAL_OVERRIDE;
+ virtual void startPage( const css::geometry::RealSize2D& rSize ) SAL_OVERRIDE;
virtual void endPage() SAL_OVERRIDE;
- virtual void hyperLink( const ::com::sun::star::geometry::RealRectangle2D& rBounds,
+ virtual void hyperLink( const css::geometry::RealRectangle2D& rBounds,
const OUString& rURI ) SAL_OVERRIDE;
virtual void pushState() SAL_OVERRIDE;
virtual void popState() SAL_OVERRIDE;
virtual void setFlatness( double ) SAL_OVERRIDE;
- virtual void setTransformation( const ::com::sun::star::geometry::AffineMatrix2D& rMatrix ) SAL_OVERRIDE;
- virtual void setLineDash( const ::com::sun::star::uno::Sequence<double>& dashes,
+ virtual void setTransformation( const css::geometry::AffineMatrix2D& rMatrix ) SAL_OVERRIDE;
+ virtual void setLineDash( const css::uno::Sequence<double>& dashes,
double start ) SAL_OVERRIDE;
virtual void setLineJoin(sal_Int8) SAL_OVERRIDE;
virtual void setLineCap(sal_Int8) SAL_OVERRIDE;
virtual void setMiterLimit(double) SAL_OVERRIDE;
virtual void setLineWidth(double) SAL_OVERRIDE;
- virtual void setFillColor( const ::com::sun::star::rendering::ARGBColor& rColor ) SAL_OVERRIDE;
- virtual void setStrokeColor( const ::com::sun::star::rendering::ARGBColor& rColor ) SAL_OVERRIDE;
+ virtual void setFillColor( const css::rendering::ARGBColor& rColor ) SAL_OVERRIDE;
+ virtual void setStrokeColor( const css::rendering::ARGBColor& rColor ) SAL_OVERRIDE;
virtual void setBlendMode(sal_Int8) SAL_OVERRIDE;
virtual void setFont( const FontAttributes& rFont ) SAL_OVERRIDE;
virtual void setTextRenderMode( sal_Int32 ) SAL_OVERRIDE;
- virtual void strokePath( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE;
- virtual void fillPath( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE;
- virtual void eoFillPath( const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE;
+ virtual void strokePath( const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE;
+ virtual void fillPath( const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE;
+ virtual void eoFillPath( const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPath ) SAL_OVERRIDE;
- virtual void intersectClip(const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE;
- virtual void intersectEoClip(const ::com::sun::star::uno::Reference<
- ::com::sun::star::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE;
+ virtual void intersectClip(const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE;
+ virtual void intersectEoClip(const css::uno::Reference<
+ css::rendering::XPolyPolygon2D >& rPath) SAL_OVERRIDE;
virtual void drawGlyphs( const OUString& rGlyphs,
- const ::com::sun::star::geometry::RealRectangle2D& rRect,
- const ::com::sun::star::geometry::Matrix2D& rFontMatrix ) SAL_OVERRIDE;
+ const css::geometry::RealRectangle2D& rRect,
+ const css::geometry::Matrix2D& rFontMatrix ) SAL_OVERRIDE;
virtual void endText() SAL_OVERRIDE;
- virtual void drawMask(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xBitmap,
+ virtual void drawMask(const css::uno::Sequence<
+ css::beans::PropertyValue>& xBitmap,
bool bInvert ) SAL_OVERRIDE;
/// Given image must already be color-mapped and normalized to sRGB.
- virtual void drawImage(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xBitmap ) SAL_OVERRIDE;
+ virtual void drawImage(const css::uno::Sequence<
+ css::beans::PropertyValue>& xBitmap ) SAL_OVERRIDE;
/** Given image must already be color-mapped and normalized to sRGB.
maskColors must contain two sequences of color components
*/
- virtual void drawColorMaskedImage(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xBitmap,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::uno::Any>& xMaskColors ) SAL_OVERRIDE;
- virtual void drawMaskedImage(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xBitmap,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xMask,
+ virtual void drawColorMaskedImage(const css::uno::Sequence<
+ css::beans::PropertyValue>& xBitmap,
+ const css::uno::Sequence<
+ css::uno::Any>& xMaskColors ) SAL_OVERRIDE;
+ virtual void drawMaskedImage(const css::uno::Sequence<
+ css::beans::PropertyValue>& xBitmap,
+ const css::uno::Sequence<
+ css::beans::PropertyValue>& xMask,
bool bInvertMask) SAL_OVERRIDE;
- virtual void drawAlphaMaskedImage(const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xImage,
- const ::com::sun::star::uno::Sequence<
- ::com::sun::star::beans::PropertyValue>& xMask) SAL_OVERRIDE;
+ virtual void drawAlphaMaskedImage(const css::uno::Sequence<
+ css::beans::PropertyValue>& xImage,
+ const css::uno::Sequence<
+ css::beans::PropertyValue>& xMask) SAL_OVERRIDE;
/// nElements == -1 means fill in number of pages
void startIndicator( const OUString& rText, sal_Int32 nElements = -1 );
@@ -203,8 +203,8 @@ namespace pdfi
sal_Int32 m_nPages;
sal_Int32 m_nNextZOrder;
- com::sun::star::uno::Reference<
- com::sun::star::task::XStatusIndicator >
+ css::uno::Reference<
+ css::task::XStatusIndicator >
m_xStatusIndicator;
bool m_bHaveTextOnDocLevel;
diff --git a/sdext/source/presenter/PresenterButton.hxx b/sdext/source/presenter/PresenterButton.hxx
index f485df3..41676b5 100644
--- a/sdext/source/presenter/PresenterButton.hxx
+++ b/sdext/source/presenter/PresenterButton.hxx
@@ -163,7 +163,7 @@ private:
const OUString& rsConfgurationName);
void ThrowIfDisposed (void) const
- throw (::com::sun::star::lang::DisposedException);
+ throw (css::lang::DisposedException);
};
} }
diff --git a/sdext/source/presenter/PresenterController.hxx b/sdext/source/presenter/PresenterController.hxx
index 6694148..aaadbba 100644
--- a/sdext/source/presenter/PresenterController.hxx
+++ b/sdext/source/presenter/PresenterController.hxx
@@ -137,20 +137,20 @@ public:
// XConfigurationChangeListener
virtual void SAL_CALL notifyConfigurationChange (
- const com::sun::star::drawing::framework::ConfigurationChangeEvent& rEvent)
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ const css::drawing::framework::ConfigurationChangeEvent& rEvent)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XEventListener
virtual void SAL_CALL disposing (
- const com::sun::star::lang::EventObject& rEvent)
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ const css::lang::EventObject& rEvent)
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XFrameActionListener
virtual void SAL_CALL frameAction (
const css::frame::FrameActionEvent& rEvent)
- throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XKeyListener
@@ -238,7 +238,7 @@ private:
*/
void HandleNumericKeyPress (const sal_Int32 nKey, const sal_Int32 nModifiers);
- void ThrowIfDisposed (void) const throw (::com::sun::star::lang::DisposedException);
+ void ThrowIfDisposed (void) const throw (css::lang::DisposedException);
};
} } // end of namespace ::sdext::presenter
diff --git a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
index e056f57..8669a2a 100644
--- a/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
+++ b/sdext/source/presenter/PresenterCurrentSlideObserver.hxx
@@ -57,23 +57,23 @@ public:
virtual void SAL_CALL disposing (void) SAL_OVERRIDE;
// XSlideShowListener
- virtual void SAL_CALL paused( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL resumed( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL slideTransitionStarted( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL slideTransitionEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL slideAnimationsEnded( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL paused( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL resumed( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL slideTransitionStarted( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL slideTransitionEnded( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL slideAnimationsEnded( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL slideEnded(sal_Bool bReverse) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
+ virtual void SAL_CALL hyperLinkClicked( const OUString& hyperLink ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE;
// XAnimationListener
- virtual void SAL_CALL beginEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL endEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- virtual void SAL_CALL repeat( const ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& Node, ::sal_Int32 Repeat ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list