Skip to content

C
core
Kaydet (Commit) dc9e72df authored tarafından Noel Grandin's avatar Noel Grandin Kaydeden (comit) Noel Grandin
Dosyalara gözat
Seçenekler

com::sun::star->css in include/filter 

Change-Id: I05c314b6eb460cfcbaa7d13cae21360ce6824624
Reviewed-on: https://gerrit.libreoffice.org/19492Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 44bee388
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 119 deletions
include/filter/msfilter/escherex.hxx
Dosyayı görüntüle @ dc9e72df
...@@ -571,26 +571,26 @@ namespace com { namespace sun { namespace star { ...@@ -571,26 +571,26 @@ namespace com { namespace sun { namespace star {
struct MSFILTER_DLLPUBLIC EscherConnectorListEntry struct MSFILTER_DLLPUBLIC EscherConnectorListEntry
{ {
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXConnector; css::uno::Reference< css::drawing::XShape > mXConnector;
::com::sun::star::awt::Point maPointA; css::awt::Point maPointA;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXConnectToA; css::uno::Reference< css::drawing::XShape > mXConnectToA;
::com::sun::star::awt::Point maPointB; css::awt::Point maPointB;
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXConnectToB; css::uno::Reference< css::drawing::XShape > mXConnectToB;
sal_uInt32 GetConnectorRule( bool bFirst ); sal_uInt32 GetConnectorRule( bool bFirst );
EscherConnectorListEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rC, EscherConnectorListEntry( const css::uno::Reference< css::drawing::XShape > & rC,
const ::com::sun::star::awt::Point& rPA, const css::awt::Point& rPA,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rSA , css::uno::Reference< css::drawing::XShape > & rSA ,
const ::com::sun::star::awt::Point& rPB, const css::awt::Point& rPB,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rSB ) : css::uno::Reference< css::drawing::XShape > & rSB ) :
mXConnector ( rC ), mXConnector ( rC ),
maPointA ( rPA ), maPointA ( rPA ),
mXConnectToA( rSA ), mXConnectToA( rSA ),
maPointB ( rPB ), maPointB ( rPB ),
mXConnectToB( rSB ) {} mXConnectToB( rSB ) {}
static sal_uInt32 GetClosestPoint( const tools::Polygon& rPoly, const ::com::sun::star::awt::Point& rP ); static sal_uInt32 GetClosestPoint( const tools::Polygon& rPoly, const css::awt::Point& rP );
}; };
struct MSFILTER_DLLPUBLIC EscherExContainer struct MSFILTER_DLLPUBLIC EscherExContainer
...@@ -614,14 +614,14 @@ struct MSFILTER_DLLPUBLIC EscherExAtom ...@@ -614,14 +614,14 @@ struct MSFILTER_DLLPUBLIC EscherExAtom
struct EscherPropertyValueHelper struct EscherPropertyValueHelper
{ {
static bool GetPropertyValue( static bool GetPropertyValue(
::com::sun::star::uno::Any& rAny, css::uno::Any& rAny,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, const css::uno::Reference< css::beans::XPropertySet > &,
const OUString& rPropertyName, const OUString& rPropertyName,
bool bTestPropertyAvailability = false bool bTestPropertyAvailability = false
); );
static ::com::sun::star::beans::PropertyState GetPropertyState( static css::beans::PropertyState GetPropertyState(
const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &, const css::uno::Reference < css::beans::XPropertySet > &,
const OUString& rPropertyName const OUString& rPropertyName
); );
}; };
...@@ -692,7 +692,7 @@ class MSFILTER_DLLPUBLIC EscherGraphicProvider ...@@ -692,7 +692,7 @@ class MSFILTER_DLLPUBLIC EscherGraphicProvider
sal_uInt32 mnBlibBufSize; sal_uInt32 mnBlibBufSize;
sal_uInt32 mnBlibEntrys; sal_uInt32 mnBlibEntrys;
OUString maBaseURI; OUString maBaseURI;
protected: protected:
...@@ -708,7 +708,7 @@ public: ...@@ -708,7 +708,7 @@ public:
SvStream& rPicOutStream, SvStream& rPicOutStream,
const OString& rGraphicId, const OString& rGraphicId,
const Rectangle& rBoundRect, const Rectangle& rBoundRect,
const com::sun::star::awt::Rectangle* pVisArea = NULL, const css::awt::Rectangle* pVisArea = NULL,
const GraphicAttr* pGrafikAttr = NULL, const GraphicAttr* pGrafikAttr = NULL,
const bool ooxmlExport = false const bool ooxmlExport = false
); );
...@@ -735,20 +735,20 @@ class MSFILTER_DLLPUBLIC EscherSolverContainer ...@@ -735,20 +735,20 @@ class MSFILTER_DLLPUBLIC EscherSolverContainer
public: public:
sal_uInt32 GetShapeId( sal_uInt32 GetShapeId(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rShape const css::uno::Reference< css::drawing::XShape > & rShape
) const; ) const;
void AddShape( void AddShape(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, const css::uno::Reference< css::drawing::XShape > &,
sal_uInt32 nId sal_uInt32 nId
); );
void AddConnector( void AddConnector(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, const css::uno::Reference< css::drawing::XShape > &,
const ::com::sun::star::awt::Point& rA, const css::awt::Point& rA,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, css::uno::Reference< css::drawing::XShape > &,
const ::com::sun::star::awt::Point& rB, const css::awt::Point& rB,
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rConB css::uno::Reference< css::drawing::XShape > & rConB
); );
void WriteSolver( SvStream& ); void WriteSolver( SvStream& );
...@@ -794,7 +794,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer ...@@ -794,7 +794,7 @@ class MSFILTER_DLLPUBLIC EscherPropertyContainer
static sal_uInt32 ImplGetColor( const sal_uInt32 rColor, bool bSwap = true ); static sal_uInt32 ImplGetColor( const sal_uInt32 rColor, bool bSwap = true );
void ImplCreateGraphicAttributes( void ImplCreateGraphicAttributes(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
sal_uInt32 nBlibId, sal_uInt32 nBlibId,
bool bCreateCroppingAttributes bool bCreateCroppingAttributes
); );
...@@ -841,27 +841,27 @@ public: ...@@ -841,27 +841,27 @@ public:
void Commit( SvStream& rSt, sal_uInt16 nVersion = 3, sal_uInt16 nRecType = ESCHER_OPT ); void Commit( SvStream& rSt, sal_uInt16 nVersion = 3, sal_uInt16 nRecType = ESCHER_OPT );
bool CreateShapeProperties( bool CreateShapeProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape const css::uno::Reference< css::drawing::XShape > & rXShape
); );
bool CreateOLEGraphicProperties( bool CreateOLEGraphicProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXOleObject const css::uno::Reference< css::drawing::XShape > & rXOleObject
); );
bool CreateGraphicProperties( bool CreateGraphicProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, const css::uno::Reference< css::drawing::XShape > & rXShape,
const GraphicObject& rGraphicObj const GraphicObject& rGraphicObj
); );
bool CreateMediaGraphicProperties( bool CreateMediaGraphicProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXMediaObject const css::uno::Reference< css::drawing::XShape > & rXMediaObject
); );
/** Creates a complex ESCHER_Prop_fillBlip containing the BLIP directly (for Excel charts). */ /** Creates a complex ESCHER_Prop_fillBlip containing the BLIP directly (for Excel charts). */
bool CreateEmbeddedBitmapProperties( bool CreateEmbeddedBitmapProperties(
const OUString& rBitmapUrl, const OUString& rBitmapUrl,
::com::sun::star::drawing::BitmapMode eBitmapMode css::drawing::BitmapMode eBitmapMode
); );
/** Creates a complex ESCHER_Prop_fillBlip containing a hatch style (for Excel charts). */ /** Creates a complex ESCHER_Prop_fillBlip containing a hatch style (for Excel charts). */
bool CreateEmbeddedHatchProperties( bool CreateEmbeddedHatchProperties(
const ::com::sun::star::drawing::Hatch& rHatch, const css::drawing::Hatch& rHatch,
const Color& rBackColor, const Color& rBackColor,
bool bFillBackground bool bFillBackground
); );
...@@ -870,7 +870,7 @@ public: ...@@ -870,7 +870,7 @@ public:
// DR: #99897# if no GraphicProvider is present, a complex ESCHER_Prop_fillBlip // DR: #99897# if no GraphicProvider is present, a complex ESCHER_Prop_fillBlip
// will be created, containing the BLIP directly (e.g. for Excel charts). // will be created, containing the BLIP directly (e.g. for Excel charts).
bool CreateGraphicProperties( bool CreateGraphicProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
const OUString& rSource, const OUString& rSource,
const bool bCreateFillBitmap, const bool bCreateFillBitmap,
const bool bCreateCroppingAttributes = false, const bool bCreateCroppingAttributes = false,
...@@ -878,50 +878,50 @@ public: ...@@ -878,50 +878,50 @@ public:
const bool bOOxmlExport = false const bool bOOxmlExport = false
); );
bool CreateBlipPropertiesforOLEControl( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape); bool CreateBlipPropertiesforOLEControl( const css::uno::Reference< css::beans::XPropertySet > & rXPropSet, const css::uno::Reference< css::drawing::XShape > & rXShape);
bool CreatePolygonProperties( bool CreatePolygonProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
sal_uInt32 nFlags, sal_uInt32 nFlags,
bool bBezier, bool bBezier,
::com::sun::star::awt::Rectangle& rGeoRect, css::awt::Rectangle& rGeoRect,
tools::Polygon* pPolygon = NULL tools::Polygon* pPolygon = NULL
); );
static sal_uInt32 GetGradientColor( static sal_uInt32 GetGradientColor(
const ::com::sun::star::awt::Gradient* pGradient, const css::awt::Gradient* pGradient,
sal_uInt32 nStartColor sal_uInt32 nStartColor
); );
void CreateGradientProperties( const ::com::sun::star::awt::Gradient & rGradient ); void CreateGradientProperties( const css::awt::Gradient & rGradient );
void CreateGradientProperties( void CreateGradientProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, const css::uno::Reference< css::beans::XPropertySet > &,
bool bTransparentGradient = false bool bTransparentGradient = false
); );
void CreateLineProperties( void CreateLineProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, const css::uno::Reference< css::beans::XPropertySet > &,
bool bEdge bool bEdge
); );
void CreateFillProperties( void CreateFillProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, const css::uno::Reference< css::beans::XPropertySet > &,
bool bEdge, bool bEdge,
bool bTransparentGradient = false ); bool bTransparentGradient = false );
void CreateFillProperties( void CreateFillProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, const css::uno::Reference< css::beans::XPropertySet > &,
bool bEdge, bool bEdge,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ); const css::uno::Reference< css::drawing::XShape > & rXShape );
void CreateTextProperties( void CreateTextProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, const css::uno::Reference< css::beans::XPropertySet > &,
sal_uInt32 nText, sal_uInt32 nText,
const bool bIsCustomShape = false, const bool bIsCustomShape = false,
const bool bIsTextFrame = true const bool bIsTextFrame = true
); );
bool CreateConnectorProperties( bool CreateConnectorProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, const css::uno::Reference< css::drawing::XShape > & rXShape,
EscherSolverContainer& rSolver, EscherSolverContainer& rSolver,
::com::sun::star::awt::Rectangle& rGeoRect, css::awt::Rectangle& rGeoRect,
sal_uInt16& rShapeType, sal_uInt16& rShapeType,
sal_uInt16& rShapeFlags sal_uInt16& rShapeFlags
); );
...@@ -929,25 +929,25 @@ public: ...@@ -929,25 +929,25 @@ public:
// Because shadow properties depends to the line and fillstyle, the CreateShadowProperties method should be called at last. // Because shadow properties depends to the line and fillstyle, the CreateShadowProperties method should be called at last.
// It activ only when at least a FillStyle or LineStyle is set. // It activ only when at least a FillStyle or LineStyle is set.
bool CreateShadowProperties( bool CreateShadowProperties(
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & const css::uno::Reference< css::beans::XPropertySet > &
); );
sal_Int32 GetValueForEnhancedCustomShapeParameter( const ::com::sun::star::drawing::EnhancedCustomShapeParameter& rParameter, sal_Int32 GetValueForEnhancedCustomShapeParameter( const css::drawing::EnhancedCustomShapeParameter& rParameter,
const std::vector< sal_Int32 >& rEquationOrder, bool bAdjustTrans = false ); const std::vector< sal_Int32 >& rEquationOrder, bool bAdjustTrans = false );
// creates all necessary CustomShape properties, this includes also Text-, Shadow-, Fill-, and LineProperties // creates all necessary CustomShape properties, this includes also Text-, Shadow-, Fill-, and LineProperties
void CreateCustomShapeProperties( void CreateCustomShapeProperties(
const MSO_SPT eShapeType, const MSO_SPT eShapeType,
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & const css::uno::Reference< css::drawing::XShape > &
); );
bool IsFontWork() const; bool IsFontWork() const;
// helper functions which are also used by the escher import // helper functions which are also used by the escher import
static tools::PolyPolygon GetPolyPolygon( static tools::PolyPolygon GetPolyPolygon(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape const css::uno::Reference< css::drawing::XShape > & rXShape
); );
static tools::PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Any& rSource ); static tools::PolyPolygon GetPolyPolygon( const css::uno::Any& rSource );
static MSO_SPT GetCustomShapeType( static MSO_SPT GetCustomShapeType(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, const css::uno::Reference< css::drawing::XShape > & rXShape,
sal_uInt32& nMirrorFlags, sal_uInt32& nMirrorFlags,
OUString& rShapeType, OUString& rShapeType,
bool bOOXML = false bool bOOXML = false
...@@ -956,7 +956,7 @@ public: ...@@ -956,7 +956,7 @@ public:
// helper functions which are also used in ooxml export // helper functions which are also used in ooxml export
static bool GetLineArrow( static bool GetLineArrow(
const bool bLineStart, const bool bLineStart,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
ESCHER_LineEnd& reLineEnd, ESCHER_LineEnd& reLineEnd,
sal_Int32& rnArrowLength, sal_Int32& rnArrowLength,
sal_Int32& rnArrowWidth sal_Int32& rnArrowWidth
...@@ -966,7 +966,7 @@ public: ...@@ -966,7 +966,7 @@ public:
const MSO_SPT eShapeType, const MSO_SPT eShapeType,
sal_Int32& nAdjustmentsWhichNeedsToBeConverted sal_Int32& nAdjustmentsWhichNeedsToBeConverted
); );
static bool GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue ); static bool GetAdjustmentValue( const css::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue );
}; };
...@@ -1282,7 +1282,7 @@ public: ...@@ -1282,7 +1282,7 @@ public:
// ...Sdr... implemented in eschesdo.cxx // ...Sdr... implemented in eschesdo.cxx
void AddSdrPage( const SdrPage& rPage ); void AddSdrPage( const SdrPage& rPage );
void AddUnoShapes( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >& rxShapes ); void AddUnoShapes( const css::uno::Reference< css::drawing::XShapes >& rxShapes );
/// returns the ShapeID /// returns the ShapeID
sal_uInt32 AddSdrObject( const SdrObject& rObj, bool ooxmlExport = false ); sal_uInt32 AddSdrObject( const SdrObject& rObj, bool ooxmlExport = false );
...@@ -1300,7 +1300,7 @@ public: ...@@ -1300,7 +1300,7 @@ public:
/// ClientRecords. May set AppData::bDontWriteShape so the /// ClientRecords. May set AppData::bDontWriteShape so the
/// shape is ignored. /// shape is ignored.
virtual EscherExHostAppData* StartShape( virtual EscherExHostAppData* StartShape(
const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape, const css::uno::Reference< css::drawing::XShape >& rShape,
const Rectangle* pChildAnchor ); const Rectangle* pChildAnchor );
/// Called after a shape is written to inform the application /// Called after a shape is written to inform the application
...@@ -1326,11 +1326,11 @@ public: ...@@ -1326,11 +1326,11 @@ public:
virtual EscherExHostAppData* EnterAdditionalTextGroup(); virtual EscherExHostAppData* EnterAdditionalTextGroup();
/// Called if an ESCHER_Prop_lTxid shall be written /// Called if an ESCHER_Prop_lTxid shall be written
virtual sal_uInt32 QueryTextID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&, sal_uInt32 nShapeId ); virtual sal_uInt32 QueryTextID( const css::uno::Reference< css::drawing::XShape >&, sal_uInt32 nShapeId );
// add an dummy rectangle shape into the escher stream // add an dummy rectangle shape into the escher stream
sal_uInt32 AddDummyShape(); sal_uInt32 AddDummyShape();
static const SdrObject* GetSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rXShape ); static const SdrObject* GetSdrObject( const css::uno::Reference< css::drawing::XShape >& rXShape );
void SetHellLayerId( sal_uInt16 nId ) { mnHellLayerId = nId; } void SetHellLayerId( sal_uInt16 nId ) { mnHellLayerId = nId; }
sal_uInt16 GetHellLayerId() const { return mnHellLayerId; } sal_uInt16 GetHellLayerId() const { return mnHellLayerId; }
......
include/filter/msfilter/mscodec.hxx
Dosyayı görüntüle @ dc9e72df
...@@ -53,7 +53,7 @@ public: ...@@ -53,7 +53,7 @@ public:
The sequence contains the necessary data to initialize The sequence contains the necessary data to initialize
the codec. the codec.
*/ */
bool InitCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData ); bool InitCodec( const css::uno::Sequence< css::beans::NamedValue >& aData );
/** Retrieves the encryption data /** Retrieves the encryption data
...@@ -61,7 +61,7 @@ public: ...@@ -61,7 +61,7 @@ public:
The sequence contains the necessary data to initialize The sequence contains the necessary data to initialize
the codec. the codec.
*/ */
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData(); css::uno::Sequence< css::beans::NamedValue > GetEncryptionData();
/** Verifies the validity of the password using the passed key and hash. /** Verifies the validity of the password using the passed key and hash.
...@@ -127,7 +127,7 @@ private: ...@@ -127,7 +127,7 @@ private:
sal_uInt16 mnKey; /// Base key from password. sal_uInt16 mnKey; /// Base key from password.
sal_uInt16 mnHash; /// Hash value from password. sal_uInt16 mnHash; /// Hash value from password.
int mnRotateDistance; int mnRotateDistance;
}; };
/** Encodes and decodes data from protected MSO XLS 95- documents. /** Encodes and decodes data from protected MSO XLS 95- documents.
...@@ -193,7 +193,7 @@ public: ...@@ -193,7 +193,7 @@ public:
The sequence contains the necessary data to initialize The sequence contains the necessary data to initialize
the codec. the codec.
*/ */
bool InitCodec( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& aData ); bool InitCodec( const css::uno::Sequence< css::beans::NamedValue >& aData );
/** Retrieves the encryption data /** Retrieves the encryption data
...@@ -201,7 +201,7 @@ public: ...@@ -201,7 +201,7 @@ public:
The sequence contains the necessary data to initialize The sequence contains the necessary data to initialize
the codec. the codec.
*/ */
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > GetEncryptionData(); css::uno::Sequence< css::beans::NamedValue > GetEncryptionData();
/** Initializes the algorithm with the specified password and document ID. /** Initializes the algorithm with the specified password and document ID.
......
include/filter/msfilter/msdffimp.hxx
Dosyayı görüntüle @ dc9e72df
...@@ -465,9 +465,9 @@ protected: ...@@ -465,9 +465,9 @@ protected:
const Rectangle& rVisArea, const Rectangle& rVisArea,
const int _nCalledByGroup, const int _nCalledByGroup,
sal_Int64 nAspect ) const; sal_Int64 nAspect ) const;
static com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > CheckForConvertToSOObj( static css::uno::Reference < css::embed::XEmbeddedObject > CheckForConvertToSOObj(
sal_uInt32 nConvertFlags, SotStorage& rSrcStg, sal_uInt32 nConvertFlags, SotStorage& rSrcStg,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg, const css::uno::Reference < css::embed::XStorage >& xDestStg,
const Graphic& rGrf, const Graphic& rGrf,
const Rectangle& rVisArea ); const Rectangle& rVisArea );
...@@ -496,9 +496,9 @@ protected: ...@@ -496,9 +496,9 @@ protected:
// the following method needs to be overridden for the import of OLE objects // the following method needs to be overridden for the import of OLE objects
virtual bool GetOLEStorageName( long nOLEId, virtual bool GetOLEStorageName( long nOLEId,
OUString& rStorageName, OUString& rStorageName,
tools::SvRef<SotStorage>& rSrcStorage, tools::SvRef<SotStorage>& rSrcStorage,
com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg css::uno::Reference < css::embed::XStorage >& xDestStg
) const; ) const;
/** Prevent that (rounded) rectangles with wrapped text will always be /** Prevent that (rounded) rectangles with wrapped text will always be
...@@ -684,7 +684,7 @@ public: ...@@ -684,7 +684,7 @@ public:
static SdrOle2Obj* CreateSdrOLEFromStorage( const OUString& rStorageName, static SdrOle2Obj* CreateSdrOLEFromStorage( const OUString& rStorageName,
tools::SvRef<SotStorage>& rSrcStorage, tools::SvRef<SotStorage>& rSrcStorage,
const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg, const css::uno::Reference < css::embed::XStorage >& xDestStg,
const Graphic& rGraf, const Graphic& rGraf,
const Rectangle& rBoundRect, const Rectangle& rBoundRect,
const Rectangle& rVisArea, const Rectangle& rVisArea,
...@@ -702,8 +702,8 @@ public: ...@@ -702,8 +702,8 @@ public:
static void SolveSolver( const SvxMSDffSolverContainer& rSolver ); static void SolveSolver( const SvxMSDffSolverContainer& rSolver );
static bool SetPropValue( static bool SetPropValue(
const ::com::sun::star::uno::Any& rAny, const css::uno::Any& rAny,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, const css::uno::Reference< css::beans::XPropertySet > & rXPropSet,
const OUString& rPropertyName, const OUString& rPropertyName,
bool bTestPropertyAvailability = false bool bTestPropertyAvailability = false
); );
......
include/filter/msfilter/msocximex.hxx
Dosyayı görüntüle @ dc9e72df
...@@ -61,42 +61,35 @@ class SfxObjectShell; ...@@ -61,42 +61,35 @@ class SfxObjectShell;
class MSFILTER_DLLPUBLIC SvxMSConvertOCXControls class MSFILTER_DLLPUBLIC SvxMSConvertOCXControls
{ {
public: public:
SvxMSConvertOCXControls( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); SvxMSConvertOCXControls( const css::uno::Reference< css::frame::XModel >& xModel );
virtual ~SvxMSConvertOCXControls(); virtual ~SvxMSConvertOCXControls();
virtual bool InsertControl( virtual bool InsertControl(
const com::sun::star::uno::Reference< const css::uno::Reference<
com::sun::star::form::XFormComponent >& /*rFComp*/, css::form::XFormComponent >& /*rFComp*/,
const com::sun::star::awt::Size& /*rSize*/, const css::awt::Size& /*rSize*/,
com::sun::star::uno::Reference< css::uno::Reference<
com::sun::star::drawing::XShape >* /*pShape*/, css::drawing::XShape >* /*pShape*/,
bool /*bFloatingCtrl*/ ) {return false;} bool /*bFloatingCtrl*/ ) {return false;}
/*begin: Backwards compatibility with office 95 import, modify later*/ /*begin: Backwards compatibility with office 95 import, modify later*/
const com::sun::star::uno::Reference< const css::uno::Reference< css::lang::XMultiServiceFactory > & GetServiceFactory();
com::sun::star::lang::XMultiServiceFactory > & GetServiceFactory();
protected: protected:
const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > & const css::uno::Reference< css::drawing::XShapes > & GetShapes();
GetShapes();
const com::sun::star::uno::Reference< const css::uno::Reference< css::container::XIndexContainer > & GetFormComps();
com::sun::star::container::XIndexContainer > & GetFormComps();
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; css::uno::Reference< css::frame::XModel > mxModel;
// gecachte Interfaces // gecachte Interfaces
com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > css::uno::Reference< css::drawing::XDrawPage > xDrawPage;
xDrawPage; css::uno::Reference< css::drawing::XShapes > xShapes;
com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > css::uno::Reference< css::lang::XMultiServiceFactory > xServiceFactory;
xShapes;
com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceFactory;
// das einzige Formular // das einzige Formular
com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > css::uno::Reference< css::container::XIndexContainer > xFormComps;
xFormComps;
virtual const com::sun::star::uno::Reference< virtual const css::uno::Reference< css::drawing::XDrawPage > & GetDrawPage();
com::sun::star::drawing::XDrawPage > & GetDrawPage();
}; };
#endif #endif
......
include/filter/msfilter/msoleexp.hxx
Dosyayı görüntüle @ dc9e72df
...@@ -41,7 +41,7 @@ public: ...@@ -41,7 +41,7 @@ public:
sal_uInt32 GetFlags() const { return nConvertFlags; } sal_uInt32 GetFlags() const { return nConvertFlags; }
void ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotStorage& rDestStg ); void ExportOLEObject( svt::EmbeddedObjectRef& rObj, SotStorage& rDestStg );
void ExportOLEObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg ); void ExportOLEObject( const css::uno::Reference < css::embed::XEmbeddedObject>& rObj, SotStorage& rDestStg );
}; };
......
include/filter/msfilter/msvbahelper.hxx
Dosyayı görüntüle @ dc9e72df
...@@ -46,15 +46,15 @@ MSFILTER_DLLPUBLIC OUString extractMacroName( const OUString& rMacroUrl ); ...@@ -46,15 +46,15 @@ MSFILTER_DLLPUBLIC OUString extractMacroName( const OUString& rMacroUrl );
MSFILTER_DLLPUBLIC OUString getDefaultProjectName( SfxObjectShell* pShell ); MSFILTER_DLLPUBLIC OUString getDefaultProjectName( SfxObjectShell* pShell );
MSFILTER_DLLPUBLIC OUString resolveVBAMacro( SfxObjectShell* pShell, const OUString& rLibName, const OUString& rModuleName, const OUString& rMacroName ); MSFILTER_DLLPUBLIC OUString resolveVBAMacro( SfxObjectShell* pShell, const OUString& rLibName, const OUString& rModuleName, const OUString& rMacroName );
MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& rMacroName, bool bSearchGlobalTemplates = false ); MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const OUString& rMacroName, bool bSearchGlobalTemplates = false );
MSFILTER_DLLPUBLIC bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller ); MSFILTER_DLLPUBLIC bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, css::uno::Sequence< css::uno::Any >& aArgs, css::uno::Any& aRet, const css::uno::Any& aCaller );
MSFILTER_DLLPUBLIC ::com::sun::star::awt::KeyEvent parseKeyEvent( const OUString& sKey ) throw (::com::sun::star::uno::RuntimeException); MSFILTER_DLLPUBLIC css::awt::KeyEvent parseKeyEvent( const OUString& sKey ) throw (css::uno::RuntimeException);
MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxDoc, const ::com::sun::star::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (::com::sun::star::uno::RuntimeException, std::exception); MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const css::uno::Reference< css::frame::XModel >& rxDoc, const css::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (css::uno::RuntimeException, std::exception);
typedef ::cppu::WeakImplHelper< typedef ::cppu::WeakImplHelper<
::com::sun::star::lang::XServiceInfo, css::lang::XServiceInfo,
::com::sun::star::lang::XInitialization, css::lang::XInitialization,
::com::sun::star::script::vba::XVBAMacroResolver > VBAMacroResolverBase; css::script::vba::XVBAMacroResolver > VBAMacroResolverBase;
class VBAMacroResolver : public VBAMacroResolverBase class VBAMacroResolver : public VBAMacroResolverBase
{ {
...@@ -65,33 +65,33 @@ public: ...@@ -65,33 +65,33 @@ public:
// com.sun.star.lang.XServiceInfo interface ------------------------------- // com.sun.star.lang.XServiceInfo interface -------------------------------
virtual OUString SAL_CALL virtual OUString SAL_CALL
getImplementationName() throw (::com::sun::star::uno::RuntimeException, std::exception) override; getImplementationName() throw (css::uno::RuntimeException, std::exception) override;
virtual sal_Bool SAL_CALL virtual sal_Bool SAL_CALL
supportsService( const OUString& rService ) supportsService( const OUString& rService )
throw (::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::RuntimeException, std::exception) override;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException, std::exception) override; getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override;
// com.sun.star.lang.XInitialization interface ---------------------------- // com.sun.star.lang.XInitialization interface ----------------------------
virtual void SAL_CALL initialize( virtual void SAL_CALL initialize(
const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rArgs ) const css::uno::Sequence< css::uno::Any >& rArgs )
throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override;
// com.sun.star.script.vba.XVBAMacroResolver interface -------------------- // com.sun.star.script.vba.XVBAMacroResolver interface --------------------
virtual OUString SAL_CALL virtual OUString SAL_CALL
resolveVBAMacroToScriptURL( const OUString& rVBAMacroName ) resolveVBAMacroToScriptURL( const OUString& rVBAMacroName )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
virtual OUString SAL_CALL virtual OUString SAL_CALL
resolveScriptURLtoVBAMacro( const OUString& rScriptURL ) resolveScriptURLtoVBAMacro( const OUString& rScriptURL )
throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception) override; throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override;
private: private:
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > mxModel; css::uno::Reference< css::frame::XModel > mxModel;
SfxObjectShell* mpObjShell; SfxObjectShell* mpObjShell;
OUString maProjectName; OUString maProjectName;
}; };
......
include/filter/msfilter/svdfppt.hxx
Dosyayı görüntüle @ dc9e72df
...@@ -632,7 +632,7 @@ public: ...@@ -632,7 +632,7 @@ public:
sal_uInt32* pTableArry, sal_uInt32* pTableArry,
SvxMSDffSolverContainer* SvxMSDffSolverContainer*
); );
virtual bool ReadFormControl( tools::SvRef<SotStorage>& rSrc1, com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > & rFormComp ) const = 0; virtual bool ReadFormControl( tools::SvRef<SotStorage>& rSrc1, css::uno::Reference< css::form::XFormComponent > & rFormComp ) const = 0;
}; };
struct PPTTextCharacterStyleAtomInterpreter struct PPTTextCharacterStyleAtomInterpreter
...@@ -1289,26 +1289,26 @@ public: ...@@ -1289,26 +1289,26 @@ public:
class PPTConvertOCXControls : public SvxMSConvertOCXControls class PPTConvertOCXControls : public SvxMSConvertOCXControls
{ {
virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage() override; virtual const css::uno::Reference< css::drawing::XDrawPage > & GetDrawPage() override;
PptPageKind ePageKind; PptPageKind ePageKind;
const SdrPowerPointImport* mpPPTImporter; const SdrPowerPointImport* mpPPTImporter;
com::sun::star::uno::Reference< com::sun::star::io::XInputStream > mxInStrm; css::uno::Reference< css::io::XInputStream > mxInStrm;
public: public:
PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rxInStrm, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, PptPageKind ePKind ) : PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, css::uno::Reference< css::io::XInputStream >& rxInStrm, const css::uno::Reference< css::frame::XModel >& rxModel, PptPageKind ePKind ) :
SvxMSConvertOCXControls ( rxModel ), SvxMSConvertOCXControls ( rxModel ),
ePageKind ( ePKind ), ePageKind ( ePKind ),
mpPPTImporter ( pPPTImporter ), mpPPTImporter ( pPPTImporter ),
mxInStrm ( rxInStrm ) mxInStrm ( rxInStrm )
{}; {};
bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1, bool ReadOCXStream( tools::SvRef<SotStorage>& rSrc1,
com::sun::star::uno::Reference< css::uno::Reference<
com::sun::star::drawing::XShape > *pShapeRef=0, css::drawing::XShape > *pShapeRef=0,
bool bFloatingCtrl=false ); bool bFloatingCtrl=false );
virtual bool InsertControl( virtual bool InsertControl(
const com::sun::star::uno::Reference< com::sun::star::form::XFormComponent > &rFComp, const css::uno::Reference< css::form::XFormComponent > &rFComp,
const com::sun::star::awt::Size& rSize, const css::awt::Size& rSize,
com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShape, css::uno::Reference< css::drawing::XShape > *pShape,
bool bFloatingCtrl bool bFloatingCtrl
) override; ) override;
}; };
......
include/filter/msfilter/util.hxx
Dosyayı görüntüle @ dc9e72df
...@@ -25,7 +25,7 @@ namespace util { ...@@ -25,7 +25,7 @@ namespace util {
/// Returns the best-fit default 8bit encoding for a given locale /// Returns the best-fit default 8bit encoding for a given locale
/// i.e. useful when dealing with legacy formats which use legacy text encodings without recording /// i.e. useful when dealing with legacy formats which use legacy text encodings without recording
/// what the encoding is, but you know or can guess the language /// what the encoding is, but you know or can guess the language
MSFILTER_DLLPUBLIC rtl_TextEncoding getBestTextEncodingFromLocale(const ::com::sun::star::lang::Locale &rLocale); MSFILTER_DLLPUBLIC rtl_TextEncoding getBestTextEncodingFromLocale(const css::lang::Locale &rLocale);
/// Convert a color in BGR format to RGB. /// Convert a color in BGR format to RGB.
MSFILTER_DLLPUBLIC sal_uInt32 BGRToRGB(sal_uInt32 nColour); MSFILTER_DLLPUBLIC sal_uInt32 BGRToRGB(sal_uInt32 nColour);
...@@ -82,7 +82,7 @@ struct MSFILTER_DLLPUBLIC ApiPaperSize ...@@ -82,7 +82,7 @@ struct MSFILTER_DLLPUBLIC ApiPaperSize
class MSFILTER_DLLPUBLIC PaperSizeConv class MSFILTER_DLLPUBLIC PaperSizeConv
{ {
public: public:
static sal_Int32 getMSPaperSizeIndex( const com::sun::star::awt::Size& rSize ); static sal_Int32 getMSPaperSizeIndex( const css::awt::Size& rSize );
static const ApiPaperSize& getApiSizeForMSPaperSizeIndex( sal_Int32 nMSOPaperIndex ); static const ApiPaperSize& getApiSizeForMSPaperSizeIndex( sal_Int32 nMSOPaperIndex );
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment