diff options
Diffstat (limited to 'svx/inc/svx')
173 files changed, 1651 insertions, 6595 deletions
diff --git a/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx new file mode 100755 index 0000000000..cdfa4dadad --- /dev/null +++ b/svx/inc/svx/EnhancedCustomShapeFunctionParser.hxx @@ -0,0 +1,217 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: EnhancedCustomShapeFunctionParser.hxx,v $ + * $Revision: 1.4 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX +#define _ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX + +#include <sal/config.h> +#include <boost/shared_ptr.hpp> +#include "EnhancedCustomShapeFunctionParser.hxx" +#include <com/sun/star/drawing/EnhancedCustomShapeParameter.hpp> +#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> +#include <vector> + +#include <svx/svxdllapi.h> + +struct EnhancedCustomShapeEquation +{ + sal_Int32 nOperation; + sal_Int32 nPara[ 3 ]; + + EnhancedCustomShapeEquation() : + nOperation ( 0 ) + { + nPara[ 0 ] = nPara[ 1 ] = nPara[ 2 ] = 0; + } +}; + +class EnhancedCustomShape2d; + +namespace EnhancedCustomShape { + +enum ExpressionFunct +{ + FUNC_CONST, + + ENUM_FUNC_PI, + ENUM_FUNC_LEFT, + ENUM_FUNC_TOP, + ENUM_FUNC_RIGHT, + ENUM_FUNC_BOTTOM, + ENUM_FUNC_XSTRETCH, + ENUM_FUNC_YSTRETCH, + ENUM_FUNC_HASSTROKE, + ENUM_FUNC_HASFILL, + ENUM_FUNC_WIDTH, + ENUM_FUNC_HEIGHT, + ENUM_FUNC_LOGWIDTH, + ENUM_FUNC_LOGHEIGHT, + ENUM_FUNC_ADJUSTMENT, + ENUM_FUNC_EQUATION, + + UNARY_FUNC_ABS, + UNARY_FUNC_SQRT, + UNARY_FUNC_SIN, + UNARY_FUNC_COS, + UNARY_FUNC_TAN, + UNARY_FUNC_ATAN, + UNARY_FUNC_NEG, + + BINARY_FUNC_PLUS, + BINARY_FUNC_MINUS, + BINARY_FUNC_MUL, + BINARY_FUNC_DIV, + BINARY_FUNC_MIN, + BINARY_FUNC_MAX, + BINARY_FUNC_ATAN2, + + TERNARY_FUNC_IF +}; + +#define EXPRESSION_FLAG_SUMANGLE_MODE 1 + +SVX_DLLPUBLIC void FillEquationParameter( const com::sun::star::drawing::EnhancedCustomShapeParameter&, const sal_Int32, EnhancedCustomShapeEquation& ); + +class ExpressionNode +{ +public: + virtual ~ExpressionNode(); + + /** Predicate whether this node is constant. + + This predicate returns true, if this node is + neither time- nor ViewInfo dependent. This allows + for certain obtimizations, i.e. not the full + expression tree needs be represented by + ExpressionNodes. + + @returns true, if the note is constant + */ + virtual bool isConstant() const = 0; + + /** Operator to calculate function value. + + This method calculates the function value. + */ + virtual double operator()() const = 0; + + /** Operator to retrieve the type of expression node + */ + virtual ExpressionFunct getType() const = 0; + + /** Operator to retrieve the ms version of expression + */ + virtual com::sun::star::drawing::EnhancedCustomShapeParameter fillNode( + std::vector< EnhancedCustomShapeEquation >& rEquations, ExpressionNode* pOptionalArg, sal_uInt32 nFlags ) = 0; +}; +typedef ::boost::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr; + +/** This exception is thrown, when the arithmetic expression + parser failed to parse a string. + */ +struct ParseError +{ + ParseError() {} + ParseError( const char* ) {} +}; + +class FunctionParser +{ +public: + + /** Parse a string + + The following grammar is accepted by this method: + <code> + + number_digit = '0'|'1'|'2'|'3'|'4'|'5'|'6'|'7'|'8'|'9' + + number = number number_digit | number_digit + + identifier = 'pi'|'left'|'top'|'right'|'bottom'|'xstretch'|'ystretch'| + 'hasstroke'|'hasfill'|'width'|'height'|'logwidth'|'logheight' + + unary_function = 'abs'|'sqrt'|'sin'|'cos'|'tan'|'atan' + binary_function = 'min'|'max'|'atan2' + ternary_function = 'if' + + function_reference = '?' 'a-z,A-Z,0-9' ' ' + modifier_reference = '$' '0-9' ' ' + + basic_expression = + number | + identifier | + function_reference | + unary_function '(' additive_expression ')' | + binary_function '(' additive_expression ',' additive_expression ')' | + ternary_function '(' additive_expression ',' additive_expression ', + ' additive_expression ')' | '(' additive_expression ')' + + unary_expression = '-' basic_expression + + multiplicative_expression = + basic_expression | + multiplicative_expression '*' basic_expression | + multiplicative_expression '/' basic_expression + + additive_expression = + multiplicative_expression | + additive_expression '+' multiplicative_expression | + additive_expression '-' multiplicative_expression + + </code> + + @param rFunction + The string to parse + + @param rCustoShape + The CustomShape is required for calculation of dynamic values such + "hasstroke", function references and or modifier references ... + + @throws ParseError if an invalid expression is given. + + @return the generated function object. + */ + + SVX_DLLPUBLIC static ExpressionNodeSharedPtr parseFunction( const ::rtl::OUString& rFunction, const EnhancedCustomShape2d& rCustoShape ); + +private: + // disabled constructor/destructor, since this is + // supposed to be a singleton + FunctionParser(); + + // default: disabled copy/assignment + FunctionParser(const FunctionParser&); + FunctionParser& operator=( const FunctionParser& ); +}; + +} + +#endif /* _ENHANCEDCUSTOMSHAPEFUNCTIONPARSER_HXX */ diff --git a/svx/inc/svx/SmartTagItem.hxx b/svx/inc/svx/SmartTagItem.hxx index 51400570db..05b44e3a8a 100644 --- a/svx/inc/svx/SmartTagItem.hxx +++ b/svx/inc/svx/SmartTagItem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/smarttags/XSmartTagAction.hpp> diff --git a/svx/inc/svx/adjitem.hxx b/svx/inc/svx/adjitem.hxx index 818c3c8596..f82c492c46 100644 --- a/svx/inc/svx/adjitem.hxx +++ b/svx/inc/svx/adjitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC diff --git a/svx/inc/svx/akrnitem.hxx b/svx/inc/svx/akrnitem.hxx index 54e7785b81..059f301efe 100644 --- a/svx/inc/svx/akrnitem.hxx +++ b/svx/inc/svx/akrnitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/algitem.hxx b/svx/inc/svx/algitem.hxx index 81473875b4..c2644b9bce 100644 --- a/svx/inc/svx/algitem.hxx +++ b/svx/inc/svx/algitem.hxx @@ -33,8 +33,8 @@ // include --------------------------------------------------------------- #include <svx/svxids.hrc> -#include <svtools/poolitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/poolitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/blnkitem.hxx b/svx/inc/svx/blnkitem.hxx index 37430bc883..7f5d7bb7f5 100644 --- a/svx/inc/svx/blnkitem.hxx +++ b/svx/inc/svx/blnkitem.hxx @@ -32,8 +32,8 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/poolitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/borderline.hxx b/svx/inc/svx/borderline.hxx index 2337c66f79..1e117d040f 100644 --- a/svx/inc/svx/borderline.hxx +++ b/svx/inc/svx/borderline.hxx @@ -32,7 +32,7 @@ #define SVX_BORDERLINE_HXX #include <tools/color.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" // Line defaults in twips (former Writer defaults): diff --git a/svx/inc/svx/boxitem.hxx b/svx/inc/svx/boxitem.hxx index 82736c7410..a4ad27dc6f 100644 --- a/svx/inc/svx/boxitem.hxx +++ b/svx/inc/svx/boxitem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_BOXITEM_HXX #define _SVX_BOXITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/borderline.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/brkitem.hxx b/svx/inc/svx/brkitem.hxx index 30fd5ea1a7..eaa800a899 100644 --- a/svx/inc/svx/brkitem.hxx +++ b/svx/inc/svx/brkitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/brshitem.hxx b/svx/inc/svx/brshitem.hxx index baf4b12ff5..901c489a34 100644 --- a/svx/inc/svx/brshitem.hxx +++ b/svx/inc/svx/brshitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/charreliefitem.hxx b/svx/inc/svx/charreliefitem.hxx index b23e3c6c15..0d5a901f7e 100644 --- a/svx/inc/svx/charreliefitem.hxx +++ b/svx/inc/svx/charreliefitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <vcl/fntstyle.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/charrotateitem.hxx b/svx/inc/svx/charrotateitem.hxx index d81fbf6567..67933f26b2 100644 --- a/svx/inc/svx/charrotateitem.hxx +++ b/svx/inc/svx/charrotateitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/charscaleitem.hxx b/svx/inc/svx/charscaleitem.hxx index 9a635dac25..36a7f38f7b 100644 --- a/svx/inc/svx/charscaleitem.hxx +++ b/svx/inc/svx/charscaleitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #ifndef _SFXENUMITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #endif #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/cmapitem.hxx b/svx/inc/svx/cmapitem.hxx index 76179a11bc..625ec28ca5 100644 --- a/svx/inc/svx/cmapitem.hxx +++ b/svx/inc/svx/cmapitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/cntritem.hxx b/svx/inc/svx/cntritem.hxx index fc8e5d19bc..fa9bc7da76 100644 --- a/svx/inc/svx/cntritem.hxx +++ b/svx/inc/svx/cntritem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/colrctrl.hxx b/svx/inc/svx/colrctrl.hxx index 08b80f77d5..bcc09258b0 100644 --- a/svx/inc/svx/colrctrl.hxx +++ b/svx/inc/svx/colrctrl.hxx @@ -34,7 +34,7 @@ #include <sfx2/childwin.hxx> #include <svtools/valueset.hxx> #include <svtools/transfer.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include "svx/svxdllapi.h" class XColorTable; diff --git a/svx/inc/svx/colritem.hxx b/svx/inc/svx/colritem.hxx index b8d300e14a..da04d2120f 100644 --- a/svx/inc/svx/colritem.hxx +++ b/svx/inc/svx/colritem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/crsditem.hxx b/svx/inc/svx/crsditem.hxx index 4ee7fdb7dc..caa835b89a 100644 --- a/svx/inc/svx/crsditem.hxx +++ b/svx/inc/svx/crsditem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/vclenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index 08652fad52..b87d987b2d 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -40,39 +40,141 @@ // Bitte FIRSTFREE pflegen!!! (gilt nicht f"ur Strings) #define RID_SVX_FIRSTFREE 305 -// ResId fuer die Hintergrund-TabPage -#define RID_SVXPAGE_BACKGROUND (RID_SVX_START + 1) - -// ResId fuer die Tabulator-TabPage -#define RID_SVXPAGE_TABULATOR (RID_SVX_START + 2) +// some strings also used in CUI +#define RID_SVXSTR_PAPERBIN (RID_SVX_START + 145) +#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_SVX_START + 149) +#define RID_SVXERRCTX (RID_SVX_START + 351) +#define RID_SVXSTR_COLOR (RID_SVX_START + 179) +#define RID_SVXSTR_TRANSPARENT (RID_SVX_START + 190) +#define RID_SVXSTR_AUTOMATIC (RID_SVX_START + 841) +#define RID_SVXSTR_INVISIBLE (RID_SVX_START + 178) +#define RID_SVXSTR_NONE (RID_SVX_START + 183) +#define RID_SVXSTR_SOLID (RID_SVX_START + 160) +#define RID_SVXSTR_LINEEND (RID_SVX_START + 237) +#define RID_SVXSTR_GRADIENT (RID_SVX_START + 161) +#define RID_SVXSTR_HATCH (RID_SVX_START + 180) +#define RID_SVXSTR_BITMAP (RID_SVX_START + 167) +#define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173) +#define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311) +#define RID_SVXSTR_COLOR_USER (RID_SVX_START + 250) -// ResId's fuer die Zeichen-TabPages -#define RID_SVXPAGE_CHAR_STD (RID_SVX_START + 3) -#define RID_SVXPAGE_CHAR_EXT (RID_SVX_START + 4) -// new char pages +// factory IDs of tabpages implemented in CUI +#define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242) +#define RID_SVXPAGE_EXT_PARAGRAPH (RID_SVX_START + 7) +#define RID_SVXPAGE_GRFCROP (RID_SVX_START + 238) #define RID_SVXPAGE_CHAR_NAME (RID_SVX_START + 239) #define RID_SVXPAGE_CHAR_EFFECTS (RID_SVX_START + 240) #define RID_SVXPAGE_CHAR_POSITION (RID_SVX_START + 241) -#define RID_SVXPAGE_CHAR_TWOLINES (RID_SVX_START + 242) - -// ResId fuer die Umrahmung-TabPage +#define RID_SVXPAGE_STD_PARAGRAPH (RID_SVX_START + 6) +#define RID_SVXPAGE_ALIGN_PARAGRAPH (RID_SVX_START + 187) +#define RID_SVXPAGE_PARA_ASIAN (RID_SVX_START + 245) +#define RID_SVXPAGE_TABULATOR (RID_SVX_START + 2) +#define RID_SFXPAGE_DBREGISTER (RID_OFA_START + 123) +#define RID_SVXPAGE_NUMBERFORMAT (RID_SVX_START + 41) +#define RID_SVXPAGE_ALIGNMENT (RID_SVX_START + 90) #define RID_SVXPAGE_BORDER (RID_SVX_START + 5) +#define RID_SVXPAGE_BACKGROUND (RID_SVX_START + 1) +#define RID_SVXPAGE_PAGE (RID_SVX_START + 25) +#define RID_SVXPAGE_LINE (RID_SVX_START + 51) +#define RID_SVXPAGE_AREA (RID_SVX_START + 56) +#define RID_SVXPAGE_SHADOW (RID_SVX_START + 61) +#define RID_SVXPAGE_TRANSPARENCE (RID_SVX_START + 54) +#define RID_SVXPAGE_TEXTATTR (RID_SVX_START + 153) +#define RID_SVXPAGE_TEXTANIMATION (RID_SVX_START + 184) +#define RID_SVXPAGE_MEASURE (RID_SVX_START + 161) +#define RID_SVXPAGE_CONNECTION (RID_SVX_START + 191) +#define RID_SVXPAGE_LINE_DEF (RID_SVX_START + 52) +#define RID_SVXPAGE_LINEEND_DEF (RID_SVX_START + 53) +#define RID_SVXPAGE_NUM_OPTIONS (RID_SVX_START + 219) +#define RID_SVXPAGE_NUM_POSITION (RID_SVX_START + 220) +#define RID_SVXPAGE_PICK_SINGLE_NUM (RID_SVX_START + 215) +#define RID_SVXPAGE_PICK_BULLET (RID_SVX_START + 216) +#define RID_SVXPAGE_PICK_NUM (RID_SVX_START + 217) +#define RID_SVXPAGE_PICK_BMP (RID_SVX_START + 218) +#define RID_SVXPAGE_CAPTION (RID_SVX_START + 150) +#define RID_SVXPAGE_SWPOSSIZE (RID_SVX_START + 288) +#define RID_SVXPAGE_POSITION_SIZE (RID_SVX_START + 87) +#define RID_SVXPAGE_EVENTASSIGN (RID_SVX_START + 303) +#define RID_SVXPAGE_HATCH (RID_SVX_START + 57) +#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58) +#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59) +#define RID_SVXPAGE_ANGLE (RID_SVX_START + 48) +#define RID_SVXPAGE_SLANT (RID_SVX_START + 49) +#define RID_SVXPAGE_DISTRIBUTE (RID_SVX_START + 236) +#define RID_SVXPAGE_IMPROVEMENT (RID_SVX_START + 302) +#define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296) -// ResId's fuer die Absatz-TabPages -#define RID_SVXPAGE_STD_PARAGRAPH (RID_SVX_START + 6) -#define RID_SVXPAGE_ALIGN_PARAGRAPH (RID_SVX_START + 187) -#define RID_SVXPAGE_EXT_PARAGRAPH (RID_SVX_START + 7) + +// why extra defines for pages that already exist? +#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998) +#define RID_SCH_TransformTabDLG_SVXPAGE_SLANT (RID_SVX_START + 999) + +// ID of tabpages implemented in SVX, but used in CUI +#define RID_SVXPAGE_GRID (RID_SVX_START + 152) + +// factory IDs of dialogs implemented in CUI +#define RID_SVX_GRFFILTER_DLG_SEPIA (RID_SVX_START + 334) +#define RID_SVX_GRFFILTER_DLG_POSTER (RID_SVX_START + 335) +#define RID_SVX_GRFFILTER_DLG_MOSAIC (RID_SVX_START + 332) +#define RID_SVX_GRFFILTER_DLG_SOLARIZE (RID_SVX_START + 333) +#define RID_SVX_GRFFILTER_DLG_EMBOSS (RID_SVX_START + 336) +#define RID_SVXDLG_SEARCHFORMAT (RID_SVX_START + 21) +#define RID_SVXDLG_CHARMAP ( RID_SVX_START + 10 ) +#define RID_SVXDLG_POSTIT ( RID_SVX_START + 8 ) + +// only needed for layout: +#define RID_SVXDLG_ZOOM ( RID_SVX_START + 0 ) + +// IDs of options pages of applications +#define RID_SW_TP_MAILCONFIG (RID_OFA_START + 102) +#define RID_SW_TP_STD_FONT_CJK (RID_OFA_START + 247) +#define RID_SW_TP_STD_FONT_CTL (RID_OFA_START + 251) +#define RID_SW_TP_OPTLOAD_PAGE (RID_OFA_START + 214) +#define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206) +#define RID_SW_TP_OPTSHDWCRSR (RID_OFA_START + 211) +#define RID_SW_TP_STD_FONT (RID_OFA_START + 208) +#define RID_SW_TP_OPTPRINT_PAGE (RID_OFA_START + 209) +#define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210) +#define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212) +#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255) +#define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240) +#define RID_SW_TP_HTML_OPTPRINT_PAGE (RID_OFA_START + 242) +#define RID_SW_TP_HTML_OPTTABLE_PAGE (RID_OFA_START + 243) +#define RID_SW_TP_HTML_OPTGRID_PAGE (RID_OFA_START + 244) +#define RID_SW_TP_HTML_OPTSHDWCRSR (RID_OFA_START + 246) +#define RID_SW_TP_BACKGROUND (RID_OFA_START + 217) +#define RID_SW_TP_OPTCAPTION_PAGE (RID_OFA_START + 256) +#define SID_SC_TP_LAYOUT (RID_OFA_START + 218) +#define SID_SC_TP_CONTENT (RID_OFA_START + 219) +#define SID_SC_TP_INPUT (RID_OFA_START + 220) +#define SID_SC_TP_GRID (RID_OFA_START + 221) +#define SID_SC_TP_USERLISTS (RID_OFA_START + 222) +#define SID_SC_TP_CALC (RID_OFA_START + 223) +#define SID_SC_TP_CHANGES (RID_OFA_START + 224) +#define RID_SC_TP_PRINT (RID_OFA_START + 248) +#define SID_SI_TP_PRINT (RID_OFA_START + 236) +#define SID_SI_TP_CONTENTS (RID_OFA_START + 232) +#define SID_SI_TP_SNAP (RID_OFA_START + 234) +#define SID_SI_TP_MISC (RID_OFA_START + 237) +#define SID_SD_TP_PRINT (RID_OFA_START + 220) +#define SID_SD_TP_CONTENTS (RID_OFA_START + 225) +#define SID_SD_TP_SNAP (RID_OFA_START + 227) +#define SID_SD_TP_MISC (RID_OFA_START + 231) +#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) +#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) +#define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // calc + +//--------------------------------------------------------------------- +// ResId's fuer die Zeichen-TabPages +#define RID_SVXPAGE_CHAR_STD (RID_SVX_START + 3) +#define RID_SVXPAGE_CHAR_EXT (RID_SVX_START + 4) // moved ids +8 ... +17 to "ModalDialog" resource ids // ResId fuer den Suchen/Ersetzen-Dialog #define RID_SVXDLG_SEARCH (RID_SVX_START + 20) -#define RID_SVXDLG_SEARCHFORMAT (RID_SVX_START + 21) -#define RID_SVXDLG_SEARCHATTR (RID_SVX_START + 22) -#define RID_SVXDLG_SEARCHSIMILARITY (RID_SVX_START + 23) // ResId fuer die PageDialog -#define RID_SVXPAGE_PAGE (RID_SVX_START + 25) #define RID_SVXPAGE_FOOTER (RID_SVX_START + 26) #define RID_SVXPAGE_HEADER (RID_SVX_START + 27) #define RID_SVXQBX_DELETE_HEADFOOT (RID_SVX_START + 28) @@ -81,7 +183,6 @@ #define RID_SVXDLG_HYPHENATE (RID_SVX_START + 30) #define RID_SVXDLG_THESAURUS (RID_SVX_START + 31) #define RID_SVXDLG_THES_LANGUAGE (RID_SVX_START + 38) -#define RID_SVXDLG_SPELLCHECK (RID_SVX_START + 32) // ResIds fuer HM-QueryBoxen und Error-Strings #define RID_SVXQB_THESAURUS (RID_SVX_START + 33) @@ -92,49 +193,14 @@ // + 38 ist vergeben, siehe RID_SVXDLG_THES_LANGUAGE #define RID_SVXQB_BW_CONTINUE (RID_SVX_START + 39) -// ResId fuer den BB-Dialog -#define RID_SVXDLG_BBDLG (RID_SVX_START + 40) - -// ResId fuer die Zahlenformate-Page -#define RID_SVXPAGE_NUMBERFORMAT (RID_SVX_START + 41) - // ResId's fuer Dialoge aus StarDraw -#define RID_SVXDLG_TRANSFORM (RID_SVX_START + 45) #define RID_SVXPAGE_POSITION (RID_SVX_START + 46) #define RID_SVXPAGE_SIZE (RID_SVX_START + 47) -#define RID_SVXPAGE_POSITION_SIZE (RID_SVX_START + 87) -#define RID_SVXPAGE_SWPOSSIZE (RID_SVX_START + 288) #define RID_SVXSW_FRAMEPOSITIONS (RID_SVX_START + 289) -#define RID_SVXPAGE_ANGLE (RID_SVX_START + 48) -#define RID_SVXPAGE_SLANT (RID_SVX_START + 49) - -#define RID_SVXDLG_LINE (RID_SVX_START + 50) -#define RID_SVXPAGE_LINE (RID_SVX_START + 51) -#define RID_SVXPAGE_LINE_DEF (RID_SVX_START + 52) -#define RID_SVXPAGE_LINEEND_DEF (RID_SVX_START + 53) - -#define RID_SVXDLG_AREA (RID_SVX_START + 55) -#define RID_SVXPAGE_AREA (RID_SVX_START + 56) -#define RID_SVXPAGE_TRANSPARENCE (RID_SVX_START + 54) -#define RID_SVXPAGE_HATCH (RID_SVX_START + 57) -#define RID_SVXPAGE_BITMAP (RID_SVX_START + 58) -#define RID_SVXPAGE_GRADIENT (RID_SVX_START + 59) -#define RID_SVXPAGE_COLOR (RID_SVX_START + 60) -#define RID_SVXPAGE_SHADOW (RID_SVX_START + 61) - -#define RID_SVXDLG_NAME (RID_SVX_START + 62) -#define RID_SVXDLG_MESSBOX (RID_SVX_START + 63) - -// #i68101# -#define RID_SVXDLG_OBJECT_NAME (RID_SVX_START + 64) - #define RID_SVXIL_FRAME (RID_SVX_START + 65) #define RID_SVXIL_FRAME_HC (RID_SVX_START + 66) -// #i68101# -#define RID_SVXDLG_OBJECT_TITLE_DESC (RID_SVX_START + 67) - #define RID_SVXDLG_3D (RID_SVX_START + 70) #define RID_SVXPAGE_LIGHT3D (RID_SVX_START + 71) #define RID_SVXPAGE_3DATTR (RID_SVX_START + 72) @@ -192,9 +258,6 @@ #define RID_SVXBMP_SLIDERDECREASE_HC (RID_SVX_START + 71) #define RID_SVXBMP_SLIDERINCREASE_HC (RID_SVX_START + 72) -// Alignment-TabPage -#define RID_SVXPAGE_ALIGNMENT (RID_SVX_START + 90) - // Resource mit Bitmaps fuer die CheckListBox #define RID_CHECKLISTBOX_BITMAPS (RID_SVX_START + 91) @@ -224,8 +287,6 @@ #define RID_SVXBMP_SHADOW_SIZE (RID_SVX_START + 113) #define RID_SVXCTRL_COLOR (RID_SVX_START + 117) -#define RID_SVXBMP_LOCK (RID_SVX_START + 118) -#define RID_SVXBMP_LOCK_HC (RID_SVX_START + 119) // fuer ToolboxControl-Style #define RID_SVXTBX_STYLE (RID_SVX_START + 120) @@ -233,39 +294,12 @@ #define RID_SVXDLG_HYPERLINK (RID_SVX_START + 140) #define RID_SVXDLG_PASSWORD (RID_SVX_START + 141) -// Dialog bzw TabPage fuer Labelobjekte -#define RID_SVXPAGE_CAPTION (RID_SVX_START + 150) -#define RID_SVXDLG_CAPTION (RID_SVX_START + 151) - -//ResId fuer TabPage Raster -#define RID_SVXPAGE_GRID (RID_SVX_START + 152) - -// ResId fuer TextAttribut-Dialog -#define RID_SVXDLG_TEXT (RID_SVX_START + 183) -#define RID_SVXPAGE_TEXTATTR (RID_SVX_START + 153) -#define RID_SVXPAGE_TEXTANIMATION (RID_SVX_START + 184) - // ResId fuer InternetPage #define RID_SVXPAGE_INTERNET (RID_SVX_START + 154) -// ResId fuer FontSubstitution -#define RID_SVX_FONT_SUBSTITUTION (RID_SVX_START + 18) - -// insert row&col dialog -#define DLG_INS_ROW_COL (RID_SVX_START + 156) - //InetDlg -#define RID_SVXPAGE_INET_MAIL (RID_SVX_START + 155) -#define RID_SVXPAGE_INET_PROXY (RID_SVX_START + 157) #define RID_SVXPAGE_INET_CACHE (RID_SVX_START + 158) #define RID_SVXPAGE_INET_TYPE (RID_SVX_START + 159) -#define RID_SVXPAGE_INET_SEARCH (RID_SVX_START + 160) -//added by jmeng begin -#define RID_SVXPAGE_INET_MOZPLUGIN (RID_SVX_START + 2161) -#define GB_MOZPLUGIN 1 -#define CB_MOZPLUGIN_CODE 2 -//added by jmeng end -#define RID_SVXPAGE_INET_SECURITY (RID_SVX_START + 200) #define RID_SVXPAGE_BROWSER_OTHER (RID_SVX_START + 202) #define RID_CACHE_EXTRA_DLG (RID_SVX_START + 203) @@ -279,9 +313,6 @@ #define RID_SVXPAGE_REGISTER_5 (RID_SVX_START + 198) #define RID_SVXPAGE_REGISTER_6 (RID_SVX_START + 199) -// ResId fuer Measure-Dialog -#define RID_SVXPAGE_MEASURE (RID_SVX_START + 161) - // 3D-Entfernung/Perspektive Bitmaps #define RID_SVXBMP_3D_DISTANCE_01 (RID_SVX_START + 162) #define RID_SVXBMP_3D_DISTANCE_02 (RID_SVX_START + 163) @@ -309,18 +340,12 @@ #define RID_SVXTBX_DRAW (RID_SVX_START + 189) #define RID_SVXTBX_ALIGNMENT (RID_SVX_START + 190) -#define RID_SVXPAGE_CONNECTION (RID_SVX_START + 191) - // Ids fuer Autokorrektur #define RID_SVX_AUTOCORR (RID_SVX_START + 192) // Auswahl ext. Linguitik #define RID_SVX_OPT_EXT_LINGU (RID_SVX_START + 193) -// Extra Dialog f"ur Option Pfade -#define RID_SVXDLG_MULTIPATH (RID_SVX_START + 201) -#define RID_MULTIPATH_DBL_ERR (RID_SVX_START + 207) - // TabPage und Dialog f"ur LDAP-Server #define RID_SVXPAGE_LDAP (RID_SVX_START + 204) #define RID_SVXDLG_LDAP (RID_SVX_START + 205) @@ -328,71 +353,26 @@ // Dialog fuer Funktionen #define RID_SVXDLG_CALCFUNC (RID_SVX_START + 206) -// Errorbox f"ur Optionen/Pfade -#define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) - -// Messboxen f"ur Optionen/Benutzerdaten -#define RID_SVXQB_CHANGEDATA (RID_SVX_START + 214) - // QueryBox for Exit Recovery Wizard #define RID_SVXQB_EXIT_RECOVERY (RID_SVX_START + 215) // ResId fuer den ImportGraphic-Dialog #define RID_SVXRES_IMPORTGRAPHIC (RID_SVX_START + 499) -#define RID_SVXPAGE_PICK_SINGLE_NUM (RID_SVX_START + 215) -#define RID_SVXPAGE_PICK_BULLET (RID_SVX_START + 216) -#define RID_SVXPAGE_PICK_NUM (RID_SVX_START + 217) -#define RID_SVXPAGE_PICK_BMP (RID_SVX_START + 218) -#define RID_SVXPAGE_NUM_OPTIONS (RID_SVX_START + 219) -#define RID_SVXPAGE_NUM_POSITION (RID_SVX_START + 220) - - -#define RID_SVXERR_OPT_PROXYPORTS (RID_SVX_START + 224) -#define RID_SVXDLG_OPT_JAVASCRIPT_DISABLE (RID_SVX_START + 225) #define RID_SVXCTRL_RECTBTNS (RID_SVX_START + 226) // ResId's f???r Hyperlink-Dialog-Tabpages -#define RID_SVXDLG_NEWHYPERLINK (RID_SVX_START + 227) -#define RID_SVXPAGE_HYPERLINK_INTERNET (RID_SVX_START + 228) -#define RID_SVXPAGE_HYPERLINK_MAIL (RID_SVX_START + 229) -#define RID_SVXPAGE_HYPERLINK_DOCUMENT (RID_SVX_START + 230) -#define RID_SVXPAGE_HYPERLINK_NEWDOCUMENT (RID_SVX_START + 231) -#define RID_SVXFLOAT_HYPERLINK_MARKWND (RID_SVX_START + 232) // ResId's for Starone impl. bitmaps #define RID_UNODRAW_OBJECTS (RID_SVX_START + 233) #define RID_UNODRAW_OLE2 (RID_SVX_START + 234) #define RID_UNODRAW_GRAPHICS (RID_SVX_START + 235) -// ResId fuer Distribute-Dialog -#define RID_SVXPAGE_DISTRIBUTE (RID_SVX_START + 236) - -// tabpage for graphic cropping -#define RID_SVXPAGE_GRFCROP (RID_SVX_START + 238) - #define RID_SVXIMG_NOTCHECKED (RID_SVX_START + 243) #define RID_SVXIMG_CHECKED (RID_SVX_START + 244) -#define RID_SVXPAGE_PARA_ASIAN (RID_SVX_START + 245) -#define RID_SVXPAGE_ASIAN_LAYOUT (RID_SVX_START + 246) - #define RID_SVXDLG_RUBY (RID_SVX_START + 247) -#define RID_SVXDLG_FILTER_WARNING (RID_SVX_START + 248) - -#define RID_SVXPAGE_COLORCONFIG (RID_SVX_START + 249) -#define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250) -#define RID_SVXPAGE_SSO (RID_SVX_START + 251) -#define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252) -#define RID_SVXPAGE_OPTIONS_JAVA (RID_SVX_START + 253) -#define RID_SVXDLG_JAVA_PARAMETER (RID_SVX_START + 254) -#define RID_SVXDLG_JAVA_CLASSPATH (RID_SVX_START + 255) -#define RID_SVXERR_JRE_NOT_RECOGNIZED (RID_SVX_START + 256) -#define RID_SVXERR_JRE_FAILED_VERSION (RID_SVX_START + 257) - -#define RID_DLG_SCRIPTORGANIZER (RID_SVX_START + 258) -#define RID_DLG_SCRIPTSELECTOR (RID_SVX_START + 259) #define RID_SVXBMP_FONTWORK_FORM1_H (RID_SVX_START + 260) #define RID_SVXBMP_FONTWORK_FORM2_H (RID_SVX_START + 261) @@ -406,10 +386,6 @@ #define RID_SVXBMP_FONTWORK_FORM10_H (RID_SVX_START + 269) #define RID_SVXBMP_FONTWORK_FORM11_H (RID_SVX_START + 270) #define RID_SVXBMP_FONTWORK_FORM12_H (RID_SVX_START + 271) -#define RID_SVXBMP_HLINETTP_H (RID_SVX_START + 272) -#define RID_SVXBMP_HLMAILTP_H (RID_SVX_START + 273) -#define RID_SVXBMP_HLDOCTP_H (RID_SVX_START + 274) -#define RID_SVXBMP_HLDOCNTP_H (RID_SVX_START + 275) #define RID_SVXIMG_GRAF_RED_H (RID_SVX_START + 276) #define RID_SVXIMG_GRAF_GREEN_H (RID_SVX_START + 277) #define RID_SVXIMG_GRAF_BLUE_H (RID_SVX_START + 278) @@ -417,29 +393,11 @@ #define RID_SVXIMG_GRAF_CONTRAST_H (RID_SVX_START + 280) #define RID_SVXIMG_GRAF_GAMMA_H (RID_SVX_START + 281) #define RID_SVXIMG_GRAF_TRANSPARENCE_H (RID_SVX_START + 282) -#define RID_SVXIMG_LOAD_H (RID_SVX_START + 283) -#define RID_SVXIMG_SAVE_H (RID_SVX_START + 284) #define RID_SVXIMG_CHECKED_H (RID_SVX_START + 285) #define RID_SVXDLG_TEXTCONTROL_CHARATTR (RID_SVX_START + 286) #define RID_SVXDLG_TEXTCONTROL_PARAATTR (RID_SVX_START + 287) -#define RID_DLG_NEWLIB (RID_SVX_START + 290) - -#define RID_SVXDLG_CUSTOMIZE (RID_SVX_START + 291) -#define RID_SVXPAGE_MENUS (RID_SVX_START + 292) -#define RID_SVXPAGE_KEYBOARD (RID_SVX_START + 293) -#define RID_SVXPAGE_TOOLBARS (RID_SVX_START + 294) -#define RID_SVXPAGE_EVENTS (RID_SVX_START + 295) -#define RID_SVXPAGE_MACROASSIGN (RID_SVX_START + 296) -#define RID_SVXDLG_ASSIGNCOMPONENT (RID_SVX_START + 297) -#define RID_SVXPAGE_ONLINEUPDATE (RID_SVX_START + 298) -#define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299) -#define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300) -#define RID_SVXDLG_WEBCONNECTION_INFO (RID_SVX_START + 301) -#define RID_SVXPAGE_IMPROVEMENT (RID_SVX_START + 302) -#define RID_SVXPAGE_EVENTASSIGN (RID_SVX_START + 303) -#define RID_SVXPAGE_CONFIGGROUPBOX (RID_SVX_START + 304) // !!! please update RID_SVX_FIRSTFREE !!! see line 46 // Strings ------------------------------------------------------------------ @@ -479,89 +437,56 @@ #define RID_SVXSTR_HMERR_ADDWORD (RID_SVX_START + 95) #define RID_SVXSTR_HMSTATUS_INVALID_LANG (RID_SVX_START + 96) -// Strings fuers Paperformat +// paper formats #define RID_SVXSTR_PAPER_A0 (RID_SVX_START + 100) -#define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 101) -#define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 102) -#define RID_SVXSTR_PAPER_A3 (RID_SVX_START + 103) -#define RID_SVXSTR_PAPER_A4 (RID_SVX_START + 104) -#define RID_SVXSTR_PAPER_A5 (RID_SVX_START + 105) -#define RID_SVXSTR_PAPER_B4_ISO (RID_SVX_START + 106) -#define RID_SVXSTR_PAPER_B5_ISO (RID_SVX_START + 107) -#define RID_SVXSTR_PAPER_LETTER (RID_SVX_START + 108) -#define RID_SVXSTR_PAPER_LEGAL (RID_SVX_START + 109) -#define RID_SVXSTR_PAPER_TABLOID (RID_SVX_START + 110) -#define RID_SVXSTR_PAPER_USER (RID_SVX_START + 111) -#define RID_SVXSTR_PAPER_B6_ISO (RID_SVX_START + 112) -#define RID_SVXSTR_PAPER_C4 (RID_SVX_START + 113) -#define RID_SVXSTR_PAPER_C5 (RID_SVX_START + 114) -#define RID_SVXSTR_PAPER_C6 (RID_SVX_START + 115) -#define RID_SVXSTR_PAPER_C65 (RID_SVX_START + 116) -#define RID_SVXSTR_PAPER_DL (RID_SVX_START + 117) -#define RID_SVXSTR_PAPER_DIA (RID_SVX_START + 118) -#define RID_SVXSTR_PAPER_SCREEN (RID_SVX_START + 119) -#define RID_SVXSTR_PAPER_C (RID_SVX_START + 120) -#define RID_SVXSTR_PAPER_D (RID_SVX_START + 121) -#define RID_SVXSTR_PAPER_E (RID_SVX_START + 122) -#define RID_SVXSTR_PAPER_EXECUTIVE (RID_SVX_START + 123) -#define RID_SVXSTR_PAPER_LEGAL2 (RID_SVX_START + 124) -#define RID_SVXSTR_PAPER_MONARCH (RID_SVX_START + 125) -#define RID_SVXSTR_PAPER_COM675 (RID_SVX_START + 126) -#define RID_SVXSTR_PAPER_COM9 (RID_SVX_START + 127) -#define RID_SVXSTR_PAPER_COM10 (RID_SVX_START + 128) -#define RID_SVXSTR_PAPER_COM11 (RID_SVX_START + 129) -#define RID_SVXSTR_PAPER_COM12 (RID_SVX_START + 130) -#define RID_SVXSTR_PAPER_KAI16 (RID_SVX_START + 131) -#define RID_SVXSTR_PAPER_KAI32 (RID_SVX_START + 132) -#define RID_SVXSTR_PAPER_KAI32BIG (RID_SVX_START + 133) -#define RID_SVXSTR_PAPER_B4_JIS (RID_SVX_START + 134) -#define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 135) -#define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 136) - -#define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142) -#define RID_SVXSTRARY_PAPERSIZE_DRAW (RID_SVX_START + 143) +#define RID_SVXSTR_PAPER_A1 (RID_SVX_START + 101) +#define RID_SVXSTR_PAPER_A2 (RID_SVX_START + 102) +#define RID_SVXSTR_PAPER_A3 (RID_SVX_START + 103) +#define RID_SVXSTR_PAPER_A4 (RID_SVX_START + 104) +#define RID_SVXSTR_PAPER_A5 (RID_SVX_START + 105) +#define RID_SVXSTR_PAPER_B4_ISO (RID_SVX_START + 106) +#define RID_SVXSTR_PAPER_B5_ISO (RID_SVX_START + 107) +#define RID_SVXSTR_PAPER_LETTER (RID_SVX_START + 108) +#define RID_SVXSTR_PAPER_LEGAL (RID_SVX_START + 109) +#define RID_SVXSTR_PAPER_TABLOID (RID_SVX_START + 110) +#define RID_SVXSTR_PAPER_USER (RID_SVX_START + 111) +#define RID_SVXSTR_PAPER_B6_ISO (RID_SVX_START + 112) +#define RID_SVXSTR_PAPER_C4 (RID_SVX_START + 113) +#define RID_SVXSTR_PAPER_C5 (RID_SVX_START + 114) +#define RID_SVXSTR_PAPER_C6 (RID_SVX_START + 115) +#define RID_SVXSTR_PAPER_C65 (RID_SVX_START + 116) +#define RID_SVXSTR_PAPER_DL (RID_SVX_START + 117) +#define RID_SVXSTR_PAPER_DIA (RID_SVX_START + 118) +#define RID_SVXSTR_PAPER_SCREEN (RID_SVX_START + 119) +#define RID_SVXSTR_PAPER_C (RID_SVX_START + 120) +#define RID_SVXSTR_PAPER_D (RID_SVX_START + 121) +#define RID_SVXSTR_PAPER_E (RID_SVX_START + 122) +#define RID_SVXSTR_PAPER_EXECUTIVE (RID_SVX_START + 123) +#define RID_SVXSTR_PAPER_LEGAL2 (RID_SVX_START + 124) +#define RID_SVXSTR_PAPER_MONARCH (RID_SVX_START + 125) +#define RID_SVXSTR_PAPER_COM675 (RID_SVX_START + 126) +#define RID_SVXSTR_PAPER_COM9 (RID_SVX_START + 127) +#define RID_SVXSTR_PAPER_COM10 (RID_SVX_START + 128) +#define RID_SVXSTR_PAPER_COM11 (RID_SVX_START + 129) +#define RID_SVXSTR_PAPER_COM12 (RID_SVX_START + 130) +#define RID_SVXSTR_PAPER_KAI16 (RID_SVX_START + 131) +#define RID_SVXSTR_PAPER_KAI32 (RID_SVX_START + 132) +#define RID_SVXSTR_PAPER_KAI32BIG (RID_SVX_START + 133) +#define RID_SVXSTR_PAPER_B4_JIS (RID_SVX_START + 134) +#define RID_SVXSTR_PAPER_B5_JIS (RID_SVX_START + 135) +#define RID_SVXSTR_PAPER_B6_JIS (RID_SVX_START + 136) + #define RID_SVXSTR_FULLSIZE (RID_SVX_START + 144) -#define RID_SVXSTR_PAPERBIN (RID_SVX_START + 145) // ResIds fuer die verschiedenen Strings des PageDlgs #define RID_SVXSTR_CALC_PAGE (RID_SVX_START + 146) #define RID_SVXSTR_DRAW_PAGE (RID_SVX_START + 147) -#define RID_SVXSTR_WRITER_PAGE (RID_SVX_START + 148) - -#define RID_SVXSTR_PAPERBIN_SETTINGS (RID_SVX_START + 149) // HM_ERR #define RID_SVXSTR_HMERR_THESAURUS (RID_SVX_START + 150) #define RID_SVXSTR_HMERR_HYPH (RID_SVX_START + 151) -// Strings aus den StarDraw-Dialogen -#define RID_SVXSTR_SOLID (RID_SVX_START + 160) -#define RID_SVXSTR_GRADIENT (RID_SVX_START + 161) -#define RID_SVXSTR_DESC_GRADIENT (RID_SVX_START + 163) -#define RID_SVXSTR_DEL_GRADIENT (RID_SVX_START + 164) -#define RID_SVXSTR_ASK_DEL_GRADIENT (RID_SVX_START + 165) -#define RID_SVXSTR_ASK_CHANGE_GRADIENT (RID_SVX_START + 166) -#define RID_SVXSTR_BITMAP (RID_SVX_START + 167) -#define RID_SVXSTR_DESC_NEW_BITMAP (RID_SVX_START + 168) -#define RID_SVXSTR_DESC_EXT_BITMAP (RID_SVX_START + 169) -#define RID_SVXSTR_DEL_BITMAP (RID_SVX_START + 170) -#define RID_SVXSTR_ASK_DEL_BITMAP (RID_SVX_START + 171) -#define RID_SVXSTR_ASK_CHANGE_BITMAP (RID_SVX_START + 172) -#define RID_SVXSTR_LINESTYLE (RID_SVX_START + 173) -#define RID_SVXSTR_DESC_LINESTYLE (RID_SVX_START + 174) -#define RID_SVXSTR_DEL_LINESTYLE (RID_SVX_START + 175) -#define RID_SVXSTR_ASK_DEL_LINESTYLE (RID_SVX_START + 176) -#define RID_SVXSTR_ASK_CHANGE_LINESTYLE (RID_SVX_START + 177) -#define RID_SVXSTR_INVISIBLE (RID_SVX_START + 178) -#define RID_SVXSTR_COLOR (RID_SVX_START + 179) -#define RID_SVXSTR_HATCH (RID_SVX_START + 180) -#define RID_SVXSTR_CHANGE (RID_SVX_START + 181) -#define RID_SVXSTR_ADD (RID_SVX_START + 182) -#define RID_SVXSTR_NONE (RID_SVX_START + 183) -#define RID_SVXSTR_ASK_CHANGE_LINEEND (RID_SVX_START + 184) - // Strings der ToolBox-Controls aus tbcontrl.cxx -#define RID_SVXSTR_TRANSPARENT (RID_SVX_START + 190) #define RID_SVXSTR_FILLPATTERN (RID_SVX_START + 191) #define RID_SVXSTR_FRAME (RID_SVX_START + 192) #define RID_SVXSTR_FRAME_COLOR (RID_SVX_START + 194) @@ -586,36 +511,12 @@ #define RID_SVXSTR_SELMODE_ER (RID_SVX_START + 213) #define RID_SVXSTR_SELMODE_ERG (RID_SVX_START + 214) -// Strings fuer ColorTabPage -#define RID_SVXSTR_DESC_COLOR (RID_SVX_START + 215) -#define RID_SVXSTR_DEL_COLOR (RID_SVX_START + 216) -#define RID_SVXSTR_ASK_DEL_COLOR (RID_SVX_START + 217) -#define RID_SVXSTR_ASK_CHANGE_COLOR (RID_SVX_START + 218) -#define RID_SVXSTR_ASK_DEL_LINEEND (RID_SVX_START + 219) - -// "Tabelle" -#define RID_SVXSTR_TABLE (RID_SVX_START + 220) - #define RID_SVXSTR_XMLSEC_SIG_OK (RID_SVX_START + 222) #define RID_SVXSTR_XMLSEC_SIG_OK_NO_VERIFY (RID_SVX_START + 223) #define RID_SVXSTR_XMLSEC_SIG_NOT_OK (RID_SVX_START + 224) #define RID_SVXSTR_XMLSEC_NO_SIG (RID_SVX_START + 225) #define RID_SVXSTR_XMLSEC_SIG_CERT_OK_PARTIAL_SIG (RID_SVX_START + 226) -// Strings von der Hatch-Tabpage -#define RID_SVXSTR_WRITE_DATA_ERROR (RID_SVX_START + 229) -#define RID_SVXSTR_READ_DATA_ERROR (RID_SVX_START + 230) -#define RID_SVXSTR_WARN_TABLE_OVERWRITE (RID_SVX_START + 231) -#define RID_SVXSTR_DESC_HATCH (RID_SVX_START + 232) -#define RID_SVXSTR_DEL_HATCH (RID_SVX_START + 233) -#define RID_SVXSTR_ASK_DEL_HATCH (RID_SVX_START + 234) -#define RID_SVXSTR_ASK_CHANGE_HATCH (RID_SVX_START + 235) -#define RID_SVXSTR_WARN_NAME_DUPLICATE (RID_SVX_START + 236) - -// Strings der Linienenden-TabPage -#define RID_SVXSTR_LINEEND (RID_SVX_START + 237) -#define RID_SVXSTR_DESC_LINEEND (RID_SVX_START + 238) -#define RID_SVXSTR_DEL_LINEEND (RID_SVX_START + 239) // weitere ID bei 219 // String-ResId fuer den ImportGraphic-Dialog @@ -628,9 +529,6 @@ #define RID_SVXSTR_RULER_TAB_DECIMAL (RID_SVX_START + 247) #define RID_SVXSTR_RULER_TAB_CENTER (RID_SVX_START + 248) -// unbekannte Farbe im Zeichen- oder Umrandungs-Dialog -#define RID_SVXSTR_COLOR_USER (RID_SVX_START + 250) - // File-/Grafik-Link String, Dialog Name #define RID_SVXSTR_FILELINK (RID_SVX_START + 255) #define RID_SVXSTR_GRAFIKLINK (RID_SVX_START + 256) @@ -686,35 +584,22 @@ #define RID_SVXSTR_NOTCENTERED (RID_SVX_START + 307) // String-Arrays -#define RID_SVXSTR_FIELDUNIT_TABLE (RID_SVX_START + 311) #define RID_SVXSTR_TEXTENCODING_TABLE (RID_SVX_START + 312) -// Strings fuer die Optionen-TabPages -#define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320) - // Hyperlink-Dlg #define RID_SVXMN_HYPERLINK (RID_SVX_START + 321) // Hyperlink-QueryBoxen #define RID_SVXQB_NOCONNECT (RID_SVX_START + 322) #define RID_SVXQB_DONTEXIST (RID_SVX_START + 323) //color configuration -#define RID_SVXQB_DELETE_COLOR_CONFIG (RID_SVX_START + 324) // Graphic filter #define RID_SVX_GRFFILTER_START (RID_SVX_START + 330) #define RID_SVXTBX_GRFFILTER (RID_SVX_START + 331) -#define RID_SVX_GRFFILTER_DLG_MOSAIC (RID_SVX_START + 332) -#define RID_SVX_GRFFILTER_DLG_SOLARIZE (RID_SVX_START + 333) -#define RID_SVX_GRFFILTER_DLG_SEPIA (RID_SVX_START + 334) -#define RID_SVX_GRFFILTER_DLG_POSTER (RID_SVX_START + 335) -#define RID_SVX_GRFFILTER_DLG_EMBOSS (RID_SVX_START + 336) -#define RID_SVX_GRFFILTER_DLG_EMBOSS_TAB (RID_SVX_START + 337) #define RID_SVXERRCODE (RID_SVX_START + 350) -#define RID_SVXERRCTX (RID_SVX_START + 351) -// Define - Bereich fuer Gallery -// !!! aus diesem Bereich keine Defines benutzen !!! +// gallery #define RID_SVX_GALLERY_START (RID_SVX_START + 360) #define RID_SVX_GALLERY_END (RID_SVX_START + 410) @@ -747,13 +632,6 @@ #define RID_SVX_RELOAD_NORMAL (RID_SVX_START + 480) #define RID_SVX_RELOAD_SPECIAL (RID_SVX_START + 481) -// ResId's fuer SvxMultiFileDialog -#define RID_SVXSTR_FILE_TITLE (RID_SVX_START + 482) -#define RID_SVXSTR_FILE_HEADLINE (RID_SVX_START + 483) -#define RID_SVXSTR_ARCHIVE_TITLE (RID_SVX_START + 484) -#define RID_SVXSTR_ARCHIVE_HEADLINE (RID_SVX_START + 485) -#define RID_SVXSTR_MULTIFILE_DBL_ERR (RID_SVX_START + 486) - // Defines fuer die 3D-Engine #define RID_SVX_3D_UNDO_EXCHANGE_PASTE (RID_SVX_START + 489) #define RID_SVX_3D_CREATE_LATHE (RID_SVX_START + 490) @@ -766,22 +644,24 @@ #define RID_SVX_3D_UNDO_LATHE (RID_SVX_START + 497) #define RID_SVX_3D_UNDO_BREAK_LATHE (RID_SVX_START + 498) #define RID_SVX_3D_UNDO_ATTRIBUTES (RID_SVX_START + 499) + +#define RID_STR_FULLNUMS_START (RID_SVX_START + 500)//? +#define RID_STR_FULLNUMS_1 (RID_STR_FULLNUMS_START )//? +#define RID_STR_FULLNUMS_2 (RID_STR_FULLNUMS_START + 1)//? +#define RID_STR_FULLNUMS_3 (RID_STR_FULLNUMS_START + 2)//? +#define RID_STR_FULLNUMS_4 (RID_STR_FULLNUMS_START + 3)//? +#define RID_STR_FULLNUMS_5 (RID_STR_FULLNUMS_START + 4)//? +#define RID_STR_FULLNUMS_6 (RID_STR_FULLNUMS_START + 5)//? +#define RID_STR_FULLNUMS_7 (RID_STR_FULLNUMS_START + 6)//? +#define RID_STR_FULLNUMS_8 (RID_STR_FULLNUMS_START + 7)//? +#define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510)//? + // RID_SVX_END == (RID_SVX_START + 499) !!! // am besten ab 520 frei (RB) // seit der Erfindung eigener Resourcen fuer jedes Projekt kann es hier keine // Obergrenze geben (abgesehen von USHRT_MAX) (os) -#define RID_STR_FULLNUMS_START (RID_SVX_START + 500) -#define RID_STR_FULLNUMS_1 (RID_STR_FULLNUMS_START ) -#define RID_STR_FULLNUMS_2 (RID_STR_FULLNUMS_START + 1) -#define RID_STR_FULLNUMS_3 (RID_STR_FULLNUMS_START + 2) -#define RID_STR_FULLNUMS_4 (RID_STR_FULLNUMS_START + 3) -#define RID_STR_FULLNUMS_5 (RID_STR_FULLNUMS_START + 4) -#define RID_STR_FULLNUMS_6 (RID_STR_FULLNUMS_START + 5) -#define RID_STR_FULLNUMS_7 (RID_STR_FULLNUMS_START + 6) -#define RID_STR_FULLNUMS_8 (RID_STR_FULLNUMS_START + 7) #define RID_STR_BULLET_THEME (RID_SVX_START + 508) -#define RID_STR_EDIT_GRAPHIC (RID_SVX_START + 509) -#define RID_STR_FULLNUMS_7_HTML (RID_SVX_START + 510) + // ResIds for graphics drawmode #define RID_SVXSTR_GRAFMODE_STANDARD (RID_SVX_START + 520) @@ -811,17 +691,6 @@ #define RID_SVXSTR_SEABLUE (RID_SVX_START + 546) #define RID_SVXSTR_COLOR_SUN (RID_SVX_START + 547) -#define RID_SVXSTR_HYPDLG_APPLYBUT (RID_SVX_START + 548) -#define RID_SVXSTR_HYPDLG_CLOSEBUT (RID_SVX_START + 549) -#define RID_SVXSTR_HYPDLG_MACROACT1 (RID_SVX_START + 550) -#define RID_SVXSTR_HYPDLG_MACROACT2 (RID_SVX_START + 551) -#define RID_SVXSTR_HYPDLG_MACROACT3 (RID_SVX_START + 552) -#define RID_SVXSTR_HYPDLG_NOVALIDFILENAME (RID_SVX_START + 553) -#define RID_SVXBMP_HLINETTP (RID_SVX_START + 556) -#define RID_SVXBMP_HLMAILTP (RID_SVX_START + 557) -#define RID_SVXBMP_HLDOCTP (RID_SVX_START + 558) -#define RID_SVXBMP_HLDOCNTP (RID_SVX_START + 559) - // JP: string resource ids for table-autoformat-names, used in SW/SC // !!! Urgent: the order of Ids is persistent. New Ids have to append !!! #define RID_SVXSTR_TBLAFMT_BEGIN (RID_SVX_START + 560) @@ -843,16 +712,6 @@ #define RID_SVXSTR_TBLAFMT_YELLOW (RID_SVX_START + 575) #define RID_SVXSTR_TBLAFMT_END (RID_SVX_START + 576) -#define RID_SVXSTR_ICONCHOICEDLG_RESETBUT (RID_SVX_START + 580) -#define RID_SVXSTR_HYPERDLG_HLINETTP (RID_SVX_START + 581) -#define RID_SVXSTR_HYPERDLG_HLINETTP_HELP (RID_SVX_START + 582) -#define RID_SVXSTR_HYPERDLG_HLMAILTP (RID_SVX_START + 583) -#define RID_SVXSTR_HYPERDLG_HLMAILTP_HELP (RID_SVX_START + 584) -#define RID_SVXSTR_HYPERDLG_HLDOCTP (RID_SVX_START + 585) -#define RID_SVXSTR_HYPERDLG_HLDOCTP_HELP (RID_SVX_START + 586) -#define RID_SVXSTR_HYPERDLG_HLDOCNTP (RID_SVX_START + 587) -#define RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP (RID_SVX_START + 588) - // string resources for XLineJoint item #define RID_SVXSTR_LINEJOINT_NONE RID_SVXSTR_NONE #define RID_SVXSTR_LINEJOINT_MIDDLE (RID_SVX_START + 589 ) @@ -1062,9 +921,6 @@ #define RID_SVXSTR_LEND_START RID_SVXSTR_LEND0 #define RID_SVXSTR_LEND_END RID_SVXSTR_LEND11 -#define RID_SVXSTR_HYPDLG_ERR_LERR_NOENTRIES (RID_SVX_START + 800) -#define RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN (RID_SVX_START + 801) - #define RID_SVXSTR_QRY_PRINT_TITLE (RID_SVX_START + 802) #define RID_SVXSTR_QRY_PRINT_MSG (RID_SVX_START + 803) #define RID_SVXSTR_QRY_PRINT_ALL (RID_SVX_START + 804) @@ -1075,10 +931,6 @@ #define RID_SVXSTR_DIC_ERR_FULL (RID_SVX_START + 811) #define RID_SVXSTR_DIC_ERR_READONLY (RID_SVX_START + 812) -#define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START + 813) -#define RID_SVXSTR_HYPERDLG_FROM_TEXT (RID_SVX_START + 814) -#define RID_SVXSTR_HYPERDLG_QUERYOVERWRITE (RID_SVX_START + 815) - // strings for graphic attributes/undo #define RID_SVXSTR_GRAFCROP (RID_SVX_START + 820) #define RID_SVXSTR_UNDO_GRAFMODE (RID_SVX_START + 821) @@ -1091,14 +943,6 @@ #define RID_SVXSTR_UNDO_GRAFTRANSPARENCY (RID_SVX_START + 828) #define RID_SVXSTR_UNDO_GRAFCROP (RID_SVXSTR_GRAFCROP) -// weitere ResId fuer die Linguistik-Dialoge -#define RID_SVXDLG_LNG_ED_NUM_PREBREAK (RID_SVX_START + 830) -#define RID_SVXDLG_EDIT_MODULES (RID_SVX_START + 831) - -// Japanese search options TabPage -#define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START + 840) -#define RID_SVXSTR_AUTOMATIC (RID_SVX_START + 841) - // listbox control for UNDO and REDO #define RID_SVXTBX_UNDO_REDO_CTRL (RID_SVX_START + 845) #define RID_SVXSTR_NUM_UNDO_ACTIONS (RID_SVX_START + 846) @@ -1115,9 +959,6 @@ #define RID_SVXSTR_TRASNGR_END RID_SVXSTR_TRASNGR0 #define RID_SVXSTR_BORDER_CONTROL (RID_SVX_START + 852) -#define RID_SVXSTR_COLOR_CONFIG_SAVE1 (RID_SVX_START + 853) -#define RID_SVXSTR_COLOR_CONFIG_SAVE2 (RID_SVX_START + 854) -#define RID_SVXSTR_COLOR_CONFIG_DELETE (RID_SVX_START + 855) // Accessibility strings. The actual string ids are defined in // svx/inc/accessibility.hrc, the strings are defined in @@ -1125,34 +966,6 @@ #define RID_SVXSTR_ACCESSIBILITY_START (RID_SVX_START + 860) #define RID_SVXSTR_ACCESSIBILITY_END (RID_SVX_START + 950) -// string resources for svx::FrameDirectionListBox -#define RID_SVXSTR_FRAMEDIR_LTR (RID_SVX_START + 960) -#define RID_SVXSTR_FRAMEDIR_RTL (RID_SVX_START + 961) -#define RID_SVXSTR_FRAMEDIR_SUPER (RID_SVX_START + 962) - -#define RID_SVXSTR_PAGEDIR_LTR_HORI (RID_SVX_START + 965) -#define RID_SVXSTR_PAGEDIR_RTL_HORI (RID_SVX_START + 966) -#define RID_SVXSTR_PAGEDIR_RTL_VERT (RID_SVX_START + 967) -#define RID_SVXSTR_PAGEDIR_LTR_VERT (RID_SVX_START + 968) - -#define RID_SVXSTR_TABLE_PRESET_NONE (RID_SVX_START + 969) -#define RID_SVXSTR_TABLE_PRESET_ONLYOUTER (RID_SVX_START + 970) -#define RID_SVXSTR_TABLE_PRESET_OUTERHORI (RID_SVX_START + 971) -#define RID_SVXSTR_TABLE_PRESET_OUTERALL (RID_SVX_START + 972) -#define RID_SVXSTR_TABLE_PRESET_OUTERINNER (RID_SVX_START + 973) - -#define RID_SVXSTR_PARA_PRESET_DIAGONAL (RID_SVX_START + 974) -#define RID_SVXSTR_PARA_PRESET_ALL (RID_SVX_START + 975) -#define RID_SVXSTR_PARA_PRESET_LEFTRIGHT (RID_SVX_START + 976) -#define RID_SVXSTR_PARA_PRESET_TOPBOTTOM (RID_SVX_START + 977) -#define RID_SVXSTR_PARA_PRESET_ONLYLEFT (RID_SVX_START + 978) - -#define RID_SVXSTR_SHADOW_STYLE_NONE (RID_SVX_START + 979) -#define RID_SVXSTR_SHADOW_STYLE_BOTTOMRIGHT (RID_SVX_START + 980) -#define RID_SVXSTR_SHADOW_STYLE_TOPRIGHT (RID_SVX_START + 981) -#define RID_SVXSTR_SHADOW_STYLE_BOTTOMLEFT (RID_SVX_START + 982) -#define RID_SVXSTR_SHADOW_STYLE_TOPLEFT (RID_SVX_START + 983) - // 984: free #define RID_SVXFLOAT_EXTRUSION_DIRECTION (RID_SVX_START + 985) @@ -1184,129 +997,6 @@ RID_SVXFLOAT_FONTWORK_CHARSPACING above. But these IDs describe floating windows, and the following IDs are for strings, so this is no conflict. */ #define RID_SVXSTR_PAGES (RID_SVX_START + 1002) -#define RID_SVXSTR_PATH_NAME_START (RID_SVX_START + 1003) -#define RID_SVXSTR_KEY_ADDINS_PATH (RID_SVX_START + 1003) -#define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) -#define RID_SVXSTR_KEY_GLOSSARY_PATH (RID_SVX_START + 1005) -#define RID_SVXSTR_KEY_BACKUP_PATH (RID_SVX_START + 1006) -#define RID_SVXSTR_KEY_BASIC_PATH (RID_SVX_START + 1007) -#define RID_SVXSTR_KEY_BITMAP_PATH (RID_SVX_START + 1008) -#define RID_SVXSTR_KEY_CONFIG_DIR (RID_SVX_START + 1009) -#define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010) -#define RID_SVXSTR_KEY_FAVORITES_DIR (RID_SVX_START + 1011) -#define RID_SVXSTR_KEY_FILTER_PATH (RID_SVX_START + 1012) -#define RID_SVXSTR_KEY_GALLERY_DIR (RID_SVX_START + 1013) -#define RID_SVXSTR_KEY_GRAPHICS_PATH (RID_SVX_START + 1014) -#define RID_SVXSTR_KEY_HELP_DIR (RID_SVX_START + 1015) -#define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016) -#define RID_SVXSTR_KEY_MODULES_PATH (RID_SVX_START + 1017) -#define RID_SVXSTR_KEY_PALETTE_PATH (RID_SVX_START + 1018) -#define RID_SVXSTR_KEY_PLUGINS_PATH (RID_SVX_START + 1019) -#define RID_SVXSTR_KEY_STORAGE_DIR (RID_SVX_START + 1020) -#define RID_SVXSTR_KEY_TEMP_PATH (RID_SVX_START + 1021) -#define RID_SVXSTR_KEY_TEMPLATE_PATH (RID_SVX_START + 1022) -#define RID_SVXSTR_KEY_USERCONFIG_PATH (RID_SVX_START + 1023) -#define RID_SVXSTR_KEY_WORK_PATH (RID_SVX_START + 1024) -#define RID_SVXSTR_KEY_USERDICTIONARY_DIR (RID_SVX_START + 1025) - -#define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026) - -#define RID_SVXSTR_DELQUERY (RID_SVX_START + 1027) -#define RID_SVXSTR_DELQUERY_TITLE (RID_SVX_START + 1028) -#define RID_SVXSTR_DELFAILED (RID_SVX_START + 1029) -#define RID_SVXSTR_DELFAILEDPERM (RID_SVX_START + 1030) -#define RID_SVXSTR_DELFAILED_TITLE (RID_SVX_START + 1031) -#define RID_SVXSTR_CREATEFAILED (RID_SVX_START + 1032) -#define RID_SVXSTR_CREATEFAILEDPERM (RID_SVX_START + 1033) -#define RID_SVXSTR_CREATEFAILEDDUP (RID_SVX_START + 1034) -#define RID_SVXSTR_CREATEFAILED_TITLE (RID_SVX_START + 1035) -#define RID_SVXSTR_RENAMEFAILED (RID_SVX_START + 1036) -#define RID_SVXSTR_RENAMEFAILEDPERM (RID_SVX_START + 1037) -#define RID_SVXSTR_RENAMEFAILED_TITLE (RID_SVX_START + 1038) - -#define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039) -#define RID_SVXSTR_NEW_TOOLBAR (RID_SVX_START + 1040) -#define RID_SVXSTR_MOVE_MENU (RID_SVX_START + 1041) - -#define RID_SVXSTR_PRODUCTNAME_TOOLBARS (RID_SVX_START + 1042) -#define RID_SVXSTR_TOOLBAR (RID_SVX_START + 1043) -#define RID_SVXSTR_TOOLBAR_CONTENT (RID_SVX_START + 1044) -#define RID_SVXSTR_COMMANDS (RID_SVX_START + 1045) -#define RID_SVXSTR_COMMAND (RID_SVX_START + 1046) -#define RID_SVXSTR_TOOLBAR_NAME (RID_SVX_START + 1047) -#define RID_SVXSTR_ADD_SUBMENU (RID_SVX_START + 1048) -#define RID_SVXSTR_SUBMENU_NAME (RID_SVX_START + 1049) -#define RID_SVXSTR_MENU_ADDCOMMANDS_DESCRIPTION (RID_SVX_START + 1050) -#define RID_SVXSTR_EVENT_STARTAPP (RID_SVX_START + 1051) -#define RID_SVXSTR_EVENT_CLOSEAPP (RID_SVX_START + 1052) -#define RID_SVXSTR_EVENT_NEWDOC (RID_SVX_START + 1053) -#define RID_SVXSTR_EVENT_CLOSEDOC (RID_SVX_START + 1054) -#define RID_SVXSTR_EVENT_PREPARECLOSEDOC (RID_SVX_START + 1055) -#define RID_SVXSTR_EVENT_OPENDOC (RID_SVX_START + 1056) -#define RID_SVXSTR_EVENT_SAVEDOC (RID_SVX_START + 1057) -#define RID_SVXSTR_EVENT_SAVEASDOC (RID_SVX_START + 1058) -#define RID_SVXSTR_EVENT_SAVEDOCDONE (RID_SVX_START + 1059) -#define RID_SVXSTR_EVENT_SAVEASDOCDONE (RID_SVX_START + 1060) -#define RID_SVXSTR_EVENT_ACTIVATEDOC (RID_SVX_START + 1061) -#define RID_SVXSTR_EVENT_DEACTIVATEDOC (RID_SVX_START + 1062) -#define RID_SVXSTR_EVENT_PRINTDOC (RID_SVX_START + 1063) -#define RID_SVXSTR_EVENT_MODIFYCHANGED (RID_SVX_START + 1064) -#define RID_SVXSTR_EVENT_MAILMERGE (RID_SVX_START + 1065) -#define RID_SVXSTR_EVENT_PAGECOUNTCHANGE (RID_SVX_START + 1066) -//the form/dialog events -#define RID_SVXSTR_EVENT_APPROVEACTIONPERFORMED (RID_SVX_START + 1067) -#define RID_SVXSTR_EVENT_ACTIONPERFORMED (RID_SVX_START + 1068) -#define RID_SVXSTR_EVENT_CHANGED (RID_SVX_START + 1069) -#define RID_SVXSTR_EVENT_TEXTCHANGED (RID_SVX_START + 1070) -#define RID_SVXSTR_EVENT_ITEMSTATECHANGED (RID_SVX_START + 1071) -#define RID_SVXSTR_EVENT_FOCUSGAINED (RID_SVX_START + 1072) -#define RID_SVXSTR_EVENT_FOCUSLOST (RID_SVX_START + 1073) -#define RID_SVXSTR_EVENT_KEYTYPED (RID_SVX_START + 1074) -#define RID_SVXSTR_EVENT_KEYUP (RID_SVX_START + 1075) -#define RID_SVXSTR_EVENT_MOUSEENTERED (RID_SVX_START + 1076) -#define RID_SVXSTR_EVENT_MOUSEDRAGGED (RID_SVX_START + 1077) -#define RID_SVXSTR_EVENT_MOUSEMOVED (RID_SVX_START + 1078) -#define RID_SVXSTR_EVENT_MOUSEPRESSED (RID_SVX_START + 1079) -#define RID_SVXSTR_EVENT_MOUSERELEASED (RID_SVX_START + 1080) -#define RID_SVXSTR_EVENT_MOUSEEXITED (RID_SVX_START + 1081) -#define RID_SVXSTR_EVENT_APPROVERESETTED (RID_SVX_START + 1082) -#define RID_SVXSTR_EVENT_SUBMITTED (RID_SVX_START + 1083) -#define RID_SVXSTR_EVENT_BEFOREUPDATE (RID_SVX_START + 1084) -#define RID_SVXSTR_EVENT_AFTERUPDATE (RID_SVX_START + 1085) -#define RID_SVXSTR_EVENT_LOADED (RID_SVX_START + 1086) -#define RID_SVXSTR_EVENT_RELOADING (RID_SVX_START + 1087) -#define RID_SVXSTR_EVENT_RELOADED (RID_SVX_START + 1088) -#define RID_SVXSTR_EVENT_UNLOADING (RID_SVX_START + 1089) -#define RID_SVXSTR_EVENT_UNLOADED (RID_SVX_START + 1090) -#define RID_SVXSTR_EVENT_CONFIRMDELETE (RID_SVX_START + 1091) -#define RID_SVXSTR_EVENT_APPROVEROWCHANGE (RID_SVX_START + 1092) -#define RID_SVXSTR_EVENT_ROWCHANGE (RID_SVX_START + 1093) -#define RID_SVXSTR_EVENT_POSITIONING (RID_SVX_START + 1094) -#define RID_SVXSTR_EVENT_POSITIONED (RID_SVX_START + 1095) -#define RID_SVXSTR_EVENT_APPROVEPARAMETER (RID_SVX_START + 1096) -#define RID_SVXSTR_EVENT_ERROROCCURED (RID_SVX_START + 1097) -#define RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED (RID_SVX_START + 1098) -#define RID_SVXSTR_EVENT_RESETTED (RID_SVX_START + 1099) -#define RID_SVXSTR_ERROR_TITLE (RID_SVX_START + 1100) -#define RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED (RID_SVX_START + 1101) -#define RID_SVXSTR_ERROR_RUNNING (RID_SVX_START + 1102) -#define RID_SVXSTR_EXCEPTION_RUNNING (RID_SVX_START + 1103) -#define RID_SVXSTR_ERROR_AT_LINE (RID_SVX_START + 1104) -#define RID_SVXSTR_EXCEPTION_AT_LINE (RID_SVX_START + 1105) -#define RID_SVXSTR_FRAMEWORK_ERROR_RUNNING (RID_SVX_START + 1106) -#define RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE (RID_SVX_START + 1107) -#define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108) -#define RID_SVXSTR_ERROR_MESSAGE_LABEL (RID_SVX_START + 1109) - -#define QUERY_DELETE_CONFIRM (RID_SVX_START + 1110) -#define STR_LINKEDDOC_DOESNOTEXIST (RID_SVX_START + 1111) -#define STR_NAME_CONFLICT (RID_SVX_START + 1112) - -#define RID_SVXSTR_HOR_PRESET_ONLYHOR (RID_SVX_START + 1113) -#define RID_SVXSTR_VER_PRESET_ONLYVER (RID_SVX_START + 1114) -#define RID_SVXSTR_CONFIRM_MENU_RESET (RID_SVX_START + 1115) -#define RID_SVXSTR_CONFIRM_TOOLBAR_RESET (RID_SVX_START + 1116) -#define RID_SVXSTR_IMPORT_ICON_ERROR (RID_SVX_START + 1117) #define RID_SVXSTR_UNDO_APPLY_FONTWORK_SHAPE (RID_SVX_START + 1118) #define RID_SVXSTR_UNDO_APPLY_FONTWORK_SAME_LETTER_HEIGHT (RID_SVX_START + 1119) @@ -1326,71 +1016,38 @@ #define RID_SVXSTR_UNDO_APPLY_EXTRUSION_SURFACE (RID_SVX_START + 1133) #define RID_SVXSTR_UNDO_APPLY_EXTRUSION_COLOR (RID_SVX_START + 1134) -#define RID_SVXSTR_LABEL_NEW_NAME (RID_SVX_START + 1135) -#define RID_SVXSTR_RENAME_MENU (RID_SVX_START + 1136) -#define RID_SVXSTR_RENAME_TOOLBAR (RID_SVX_START + 1137) - -#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138) -#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0) -#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1) -#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2) -#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3) -#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4) -#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5) -#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6) -#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7) - -#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6) -#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7) - -#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6) -#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7) - -#define RID_SVXSTR_DIAGRAM_ROW (RID_SVX_START + 1162) -#define RID_SVXSTR_DELETE_ICON_CONFIRM (RID_SVX_START + 1163) //added for issue73355 -#define RID_SVXSTR_REPLACE_ICON_WARNING (RID_SVX_START + 1164) //added for issue73355 -#define RID_SVXSTR_REPLACE_ICON_CONFIRM (RID_SVX_START + 1165) //added for issue73355 -#define RID_SVXSTR_YESTOALL (RID_SVX_START + 1166) //added for issue73355 #define RID_SVXSTR_SELMODE_BLK (RID_SVX_START + 1167) #define RID_SVXSTR_STYLEFAMILY_TABLEDESIGN (RID_SVX_START + 1168) -#define STR_LINKEDDOC_NO_SYSTEM_FILE (RID_SVX_START + 1169) -#define RID_SVXSTR_EVENT_SUBCOMPONENT_OPENED (RID_SVX_START + 1170) -#define RID_SVXSTR_EVENT_SUBCOMPONENT_CLOSED (RID_SVX_START + 1171) - -#define RID_SVXSTR_EVENT_CREATEDOC (RID_SVX_START + 1172) -#define RID_SVXSTR_EVENT_LOADDOCFINISHED (RID_SVX_START + 1173) -#define RID_SVXSTR_EVENT_SAVEDOCFAILED (RID_SVX_START + 1174) -#define RID_SVXSTR_EVENT_SAVEASDOCFAILED (RID_SVX_START + 1175) -#define RID_SVXSTR_EVENT_COPYTODOC (RID_SVX_START + 1176) -#define RID_SVXSTR_EVENT_COPYTODOCDONE (RID_SVX_START + 1177) -#define RID_SVXSTR_EVENT_COPYTODOCFAILED (RID_SVX_START + 1178) -#define RID_SVXSTR_EVENT_VIEWCREATED (RID_SVX_START + 1179) -#define RID_SVXSTR_EVENT_PREPARECLOSEVIEW (RID_SVX_START + 1180) -#define RID_SVXSTR_EVENT_CLOSEVIEW (RID_SVX_START + 1181) -#define RID_SVXSTR_EVENT_TITLECHANGED (RID_SVX_START + 1182) -#define RID_SVXSTR_EVENT_MODECHANGED (RID_SVX_START + 1183) -#define RID_SVXSTR_EVENT_VISAREACHANGED (RID_SVX_START + 1184) -#define RID_SVXSTR_EVENT_STORAGECHANGED (RID_SVX_START + 1185) -#define RID_SVXSTR_EVENT_MAILMERGE_END (RID_SVX_START + 1186) -#define RID_SVXSTR_EVENT_FIELDMERGE (RID_SVX_START + 1187) -#define RID_SVXSTR_EVENT_FIELDMERGE_FINISHED (RID_SVX_START + 1188) -#define RID_SVXSTR_EVENT_LAYOUT_FINISHED (RID_SVX_START + 1189) // if you add here, remember to adjust RID_SVXSTR_NEXTFREE +#define RID_SVXSTR_BULLET_DESCRIPTIONS (RID_SVX_START + 1138)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTIONS (RID_SVX_START + 1146)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTIONS (RID_SVX_START + 1154)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_0 (RID_SVXSTR_BULLET_DESCRIPTIONS + 0)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_1 (RID_SVXSTR_BULLET_DESCRIPTIONS + 1)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_2 (RID_SVXSTR_BULLET_DESCRIPTIONS + 2)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_3 (RID_SVXSTR_BULLET_DESCRIPTIONS + 3)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_4 (RID_SVXSTR_BULLET_DESCRIPTIONS + 4)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_5 (RID_SVXSTR_BULLET_DESCRIPTIONS + 5)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_6 (RID_SVXSTR_BULLET_DESCRIPTIONS + 6)//? +#define RID_SVXSTR_BULLET_DESCRIPTION_7 (RID_SVXSTR_BULLET_DESCRIPTIONS + 7)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_0 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 0)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_1 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 1)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_2 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 2)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_3 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 3)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_4 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 4)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_5 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 5)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_6 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 6)//? +#define RID_SVXSTR_SINGLENUM_DESCRIPTION_7 (RID_SVXSTR_SINGLENUM_DESCRIPTIONS + 7)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_0 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 0)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_1 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 1)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_2 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 2)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_3 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 3)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_4 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 4)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_5 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 5)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_6 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 6)//? +#define RID_SVXSTR_OUTLINENUM_DESCRIPTION_7 (RID_SVXSTR_OUTLINENUM_DESCRIPTIONS + 7)//? + #define RID_SVXSTR_NEXTFREE (RID_SVX_START + 1190) // ---------------------------------------------------------------------------- @@ -1406,37 +1063,23 @@ // ---------------------------------------------------------------------------- // "Window" resource ids -#define RID_SVX_WND_COMMON_LINGU ( RID_SVX_START + 0 ) // ---------------------------------------------------------------------------- // "ModalDialog" resource ids -#define RID_SVXDLG_ZOOM ( RID_SVX_START + 0 ) -#define RID_SVX_MDLG_HANGULHANJA ( RID_SVX_START + 1 ) #define RID_SVX_MDLG_FONTWORK_GALLERY ( RID_SVX_START + 2 ) #define RID_SVX_MDLG_EXTRUSION_DEPTH ( RID_SVX_START + 3 ) -#define RID_SVX_MDLG_HANGULHANJA_OPT ( RID_SVX_START + 4 ) -#define RID_SVX_MDLG_HANGULHANJA_EDIT ( RID_SVX_START + 5 ) -#define RID_SVX_MDLG_HANGULHANJA_NEWDICT ( RID_SVX_START + 6 ) - -#define RID_SVX_FORMAT_CELLS_DLG ( RID_SVX_START + 42 ) -#define RID_SVX_SPLITCELLDLG ( RID_SVX_START + 43 ) -#define RID_SVX_NEWTABLE_DLG ( RID_SVX_START + 44 ) // ---------------------------------------------------------------------------- // "Menu" resource ids #define RID_SVX_MDLG_SCRIPTORG_NEWLIB ( RID_SVX_START + 7 ) #define RID_SVX_MDLG_FONTWORK_CHARSPACING ( RID_SVX_START + 19 ) -// ResId fuer den Notizzettel-Dialog -#define RID_SVXDLG_POSTIT ( RID_SVX_START + 8 ) - // ResId fuer den ImportClipboard-Dialog // depricated //#define RID_SVXDLG_CLIPBOARD ( RID_SVX_START + 9 ) // ResId fuer den Sonderzeichen-Dialog -#define RID_SVXDLG_CHARMAP ( RID_SVX_START + 10 ) // allgemeine DBMgr-Dialoge // depricated @@ -1463,116 +1106,42 @@ #define RID_SVXPAGE_ERR_REP_SEND ( RID_SVX_START + 11 ) // ---------------------------------------------------------------------------- -// "MessageBox" resource ids - -#define RID_SVX_MSGBOX_JAVA_RESTART ( RID_SVX_START + 0 ) -#define RID_SVX_MSGBOX_JAVA_RESTART2 ( RID_SVX_START + 1 ) -#define RID_SVX_MSGBOX_LANGUAGE_RESTART ( RID_SVX_START + 2 ) - -// ---------------------------------------------------------------------------- // !!!! double defined ID's (see below) !!! -#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100) #define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101) -#define RID_OFAPAGE_AUTOCORR_OPTIONS (RID_OFA_START + 102) -#define RID_OFAPAGE_AUTOCORR_REPLACE (RID_OFA_START + 103) -#define RID_OFAPAGE_AUTOCORR_EXCEPT (RID_OFA_START + 104) #define RID_OFA_GENERAL_OPTIONS_DLG (RID_OFA_START + 105) #define RID_OFADLG_INTERNET (RID_OFA_START + 106) #define RID_OFA_TABNEW_DLG (RID_OFA_START + 107) #define RID_OFADLG_BROWSER (RID_OFA_START + 108) -#define RID_OFAPAGE_AUTOCORR_QUOTE (RID_OFA_START + 109) -#define RID_OFAPAGE_AUTOFMT_APPLY (RID_OFA_START + 110) -#define RID_OFADLG_PRCNT_SET (RID_OFA_START + 111) #define RID_OFA_FORMNEW_DLG (RID_OFA_START + 112) #define RID_OFA_TABPROPERTIES (RID_OFA_START + 113) #define RID_OFADLG_REGISTRATION (RID_OFA_START + 114) -#define RID_OFADLG_OPTIONS_TREE (RID_OFA_START + 115) -#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116) #define RID_OFADLG_AWCP_VALUES (RID_OFA_START + 117) -#define RID_OFADLG_OPTIONS_TREE_HINT (RID_OFA_START + 118) -#define RID_OFAPAGE_AUTOCOMPLETE_OPTIONS (RID_OFA_START + 119) -#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120) -#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121) -#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122) -#define RID_SFXPAGE_DBREGISTER (RID_OFA_START + 123) -#define DLG_DOCUMENTLINK (RID_OFA_START + 124) -#define RID_OFAPAGE_SMARTTAG_OPTIONS (RID_OFA_START + 125) // TabPages -------------------------------------------------------------- // !!!! double defined ID's (see above) !!! -#define RID_RIDER_SLL_SITE (RID_OFA_START + 100) -#define RID_RIDER_SLL_PERSONAL (RID_OFA_START + 101) -#define RID_SW_TP_MAILCONFIG (RID_OFA_START + 102) - -#define RID_IMGLIST_TREEOPT (RID_OFA_START + 174) -#define RID_IMGLIST_TREEOPT_HC (RID_OFA_START + 175) -#define OFA_TP_MISC (RID_OFA_START + 200) - -#define OFA_TP_VIEW (RID_OFA_START + 202) #define OFA_TP_APPEARANCE (RID_OFA_START + 203) #define OFA_TP_TABPROPERTIES_GENERAL (RID_OFA_START + 204) -#define OFA_TP_LANGUAGES (RID_OFA_START + 205) //die RID_??_TP_* stehen nochmal im offids.hrc -#define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206) + #define RID_SW_TP_LAYOUT_OPT (RID_OFA_START + 207) -#define RID_SW_TP_STD_FONT (RID_OFA_START + 208) -#define RID_SW_TP_OPTPRINT_PAGE (RID_OFA_START + 209) -#define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210) -#define RID_SW_TP_OPTSHDWCRSR (RID_OFA_START + 211) -#define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212) #define RID_SW_TP_OPTINSERT_PAGE (RID_OFA_START + 213) -#define RID_SW_TP_OPTLOAD_PAGE (RID_OFA_START + 214) #define RID_SW_TP_OPTTEST_PAGE (RID_OFA_START + 215) #define RID_SW_TP_OPTSRCVIEW (RID_OFA_START + 216) -#define RID_SW_TP_BACKGROUND (RID_OFA_START + 217) -#define SID_SC_TP_LAYOUT (RID_OFA_START + 218) -#define SID_SC_TP_CONTENT (RID_OFA_START + 219) -#define SID_SC_TP_INPUT (RID_OFA_START + 220) -#define SID_SC_TP_GRID (RID_OFA_START + 221) -#define SID_SC_TP_USERLISTS (RID_OFA_START + 222) -#define SID_SC_TP_CALC (RID_OFA_START + 223) -#define SID_SC_TP_CHANGES (RID_OFA_START + 224) -#define SID_SD_TP_CONTENTS (RID_OFA_START + 225) +#define RID_SW_TP_OPTINSERT_HTML_PAGE (RID_OFA_START + 238) +#define RID_SW_TP_HTML_LAYOUT_OPT (RID_OFA_START + 241) #define SID_SD_TP_LAYOUT (RID_OFA_START + 226) -#define SID_SD_TP_SNAP (RID_OFA_START + 227) #define SID_SD_TP_SCALE (RID_OFA_START + 228) #define SID_SD_TP_GRID (RID_OFA_START + 229) -#define SID_SD_TP_PRINT (RID_OFA_START + 220) -#define SID_SD_TP_MISC (RID_OFA_START + 231) -#define SID_SI_TP_CONTENTS (RID_OFA_START + 232) #define SID_SI_TP_LAYOUT (RID_OFA_START + 233) -#define SID_SI_TP_SNAP (RID_OFA_START + 234) #define SID_SI_TP_GRID (RID_OFA_START + 235) -#define SID_SI_TP_PRINT (RID_OFA_START + 236) -#define SID_SI_TP_MISC (RID_OFA_START + 237) -#define RID_SW_TP_OPTINSERT_HTML_PAGE (RID_OFA_START + 238) #define SID_SC_TP_MISC (RID_OFA_START + 239) -#define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240) -#define RID_SW_TP_HTML_LAYOUT_OPT (RID_OFA_START + 241) -#define RID_SW_TP_HTML_OPTPRINT_PAGE (RID_OFA_START + 242) -#define RID_SW_TP_HTML_OPTTABLE_PAGE (RID_OFA_START + 243) -#define RID_SW_TP_HTML_OPTGRID_PAGE (RID_OFA_START + 244) #define OFA_TP_TABPROPERTIES_TEXT (RID_OFA_START + 245) -#define RID_SW_TP_HTML_OPTSHDWCRSR (RID_OFA_START + 246) -#define RID_SW_TP_STD_FONT_CJK (RID_OFA_START + 247) -#define RID_SC_TP_PRINT (RID_OFA_START + 248) #define OFA_TP_HELPERPROG (RID_OFA_START + 249) -#define OFA_TP_MEMORY (RID_OFA_START + 250) -#define RID_SW_TP_STD_FONT_CTL (RID_OFA_START + 251) -#define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // 4 SC & ID 4 resource -#define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) // 4 SD -#define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) // 4 impress -#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255) -#define OFA_TP_LANGUAGES_FOR_SET_DOCUMENT_LANGUAGE ( RID_OFA_START + 256 ) - -//add for Dialog SchTransformTabDialog,SvxTransformTabDialog //CHINA001 -#define RID_SCH_TransformTabDLG_SVXPAGE_ANGLE (RID_SVX_START + 998) -#define RID_SCH_TransformTabDLG_SVXPAGE_SLANT (RID_SVX_START + 999) #endif diff --git a/svx/inc/svx/dlgctl3d.hxx b/svx/inc/svx/dlgctl3d.hxx index 8b70601dc8..5d12e900f5 100644 --- a/svx/inc/svx/dlgctl3d.hxx +++ b/svx/inc/svx/dlgctl3d.hxx @@ -34,7 +34,7 @@ #include <vcl/ctrl.hxx> #include <vcl/scrbar.hxx> #include <vcl/button.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include "svx/svxdllapi.h" #include <basegfx/vector/b3dvector.hxx> diff --git a/svx/inc/svx/dlgctrl.hxx b/svx/inc/svx/dlgctrl.hxx index c60dcd7df7..69e83c1661 100644 --- a/svx/inc/svx/dlgctrl.hxx +++ b/svx/inc/svx/dlgctrl.hxx @@ -408,6 +408,7 @@ public: void Modify( XDashEntry* pEntry, USHORT nPos, Bitmap* pBmp = NULL ); void SelectEntryByList( const XDashList* pList, const String& rStr, const XDash& rDash, USHORT nDist = 0 ); + void FillStyles(); }; /************************************************************************* diff --git a/svx/inc/svx/e3ditem.hxx b/svx/inc/svx/e3ditem.hxx index 5056451c63..2f24e8786a 100644 --- a/svx/inc/svx/e3ditem.hxx +++ b/svx/inc/svx/e3ditem.hxx @@ -31,7 +31,7 @@ #ifndef _SVXE3DITEM_HXX #define _SVXE3DITEM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <basegfx/vector/b3dvector.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/editdata.hxx b/svx/inc/svx/editdata.hxx index 64949e46d0..de8af1ee9b 100644 --- a/svx/inc/svx/editdata.hxx +++ b/svx/inc/svx/editdata.hxx @@ -35,7 +35,7 @@ #include <tools/string.hxx> #include "svx/svxdllapi.h" -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> class SfxItemSet; class SfxPoolItem; diff --git a/svx/inc/svx/editobj.hxx b/svx/inc/svx/editobj.hxx index 90a13b7114..f2b1aaabdf 100644 --- a/svx/inc/svx/editobj.hxx +++ b/svx/inc/svx/editobj.hxx @@ -34,7 +34,7 @@ #include <tools/stream.hxx> #include <tools/debug.hxx> #include <rsc/rscsfx.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <svx/eeitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/emphitem.hxx b/svx/inc/svx/emphitem.hxx index f7aab6ba52..8d5c18b302 100644 --- a/svx/inc/svx/emphitem.hxx +++ b/svx/inc/svx/emphitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/vclenum.hxx> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/escherex.hxx b/svx/inc/svx/escherex.hxx deleted file mode 100644 index d021a13466..0000000000 --- a/svx/inc/svx/escherex.hxx +++ /dev/null @@ -1,1513 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: escherex.hxx,v $ - * $Revision: 1.6.146.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVX_ESCHEREX_HXX -#define _SVX_ESCHEREX_HXX - -#include <vector> -#include <tools/solar.h> -#include <tools/gen.hxx> -#include <tools/list.hxx> -#include <tools/stream.hxx> -#include <com/sun/star/uno/Reference.h> -#include <goodies/grfmgr.hxx> -#include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/PropertyState.hpp> -#include <com/sun/star/drawing/BitmapMode.hpp> -#include <com/sun/star/drawing/Hatch.hpp> -#include <svx/msdffdef.hxx> -#include "svx/svxdllapi.h" - - /*Record Name FBT-Value Instance Contents Wrd Exl PPt Ver*/ -// In der Mickysoft-Doku heissen die msofbt... statt ESCHER_... -#define ESCHER_DggContainer 0xF000 /* per-document data X X X */ -#define ESCHER_Dgg 0xF006 /* an FDGG and several FIDCLs X X X 0 */ -#define ESCHER_CLSID 0xF016 /* the CLSID of the application that put the data on the clipboard C C C 0 */ -#define ESCHER_OPT 0xF00B /* count of properties the document-wide default shape properties X X X 3 */ -#define ESCHER_ColorMRU 0xF11A /* count of colors the colors in the MRU swatch X X X 0 */ -#define ESCHER_SplitMenuColors 0xF11E /* count of colors the colors in the top-level split menus X X X 0 */ -#define ESCHER_BstoreContainer 0xF001 /* count of BLIPs all images in the document (JPEGs, metafiles, etc.) X X X */ -#define ESCHER_BSE 0xF007 /* BLIP type an FBSE (one per BLIP) X X X 2 */ -#define ESCHER_BlipFirst 0xF018 /* range of fbts reserved for various kinds of BLIPs X X X */ -#define ESCHER_BlipLast 0xF117 /* range of fbts reserved for various kinds of BLIPs X X X */ - -#define ESCHER_DgContainer 0xF002 /* per-sheet/page/slide data X X X */ -#define ESCHER_Dg 0xF008 /* drawing ID an FDG X X X 0 */ -#define ESCHER_RegroupItems 0xF118 /* count of regroup entries several FRITs X X X 0 */ -#define ESCHER_ColorScheme 0xF120 /* count of colors the colors of the source host's color scheme C C 0 */ -#define ESCHER_SpgrContainer 0xF003 /* several SpContainers, the first of which is the group shape itself X X X */ -#define ESCHER_SpContainer 0xF004 /* a shape X X X */ -#define ESCHER_Spgr 0xF009 /* an FSPGR; only present if the shape is a group shape X X X 1 */ -#define ESCHER_Sp 0xF00A /* shape type an FSP X X X 2 */ -//#define ESCHER_OPT 0xF00B /* count of properties a shape property table X X X 3 */ -#define ESCHER_Textbox 0xF00C /* RTF text C C C 0 */ -#define ESCHER_ClientTextbox 0xF00D /* host-defined the text in the textbox, in host-defined format X X X */ -#define ESCHER_Anchor 0xF00E /* a RECT, in 100000ths of an inch C C C 0 */ -#define ESCHER_ChildAnchor 0xF00F /* a RECT, in units relative to the parent group X X X 0 */ -#define ESCHER_ClientAnchor 0xF010 /* host-defined the location of the shape, in a host-defined format X X X */ -#define ESCHER_ClientData 0xF011 /* host-defined host-specific data X X X */ -#define ESCHER_OleObject 0xF11F /* a serialized IStorage for an OLE object C C C 0 */ -#define ESCHER_DeletedPspl 0xF11D /* an FPSPL; only present in top-level deleted shapes X 0 */ -#define ESCHER_SolverContainer 0xF005 /* count of rules the rules governing shapes X X X */ -#define ESCHER_ConnectorRule 0xF012 /* an FConnectorRule X X 1 */ -#define ESCHER_AlignRule 0xF013 /* an FAlignRule X X X 0 */ -#define ESCHER_ArcRule 0xF014 /* an FARCRU X X X 0 */ -#define ESCHER_ClientRule 0xF015 /* host-defined host-defined */ -#define ESCHER_CalloutRule 0xF017 /* an FCORU X X X 0 */ -#define ESCHER_Selection 0xF119 /* an FDGSL followed by the SPIDs of the shapes in the selection X 0 */ -#define ESCHER_UDefProp 0xF122 - -#define SHAPEFLAG_GROUP 0x001 // This shape is a group shape -#define SHAPEFLAG_CHILD 0x002 // Not a top-level shape -#define SHAPEFLAG_PATRIARCH 0x004 // This is the topmost group shape. Exactly one of these per drawing. -#define SHAPEFLAG_DELETED 0x008 // The shape has been deleted -#define SHAPEFLAG_OLESHAPE 0x010 // The shape is an OLE object -#define SHAPEFLAG_HAVEMASTER 0x020 // Shape has a hspMaster property -#define SHAPEFLAG_FLIPH 0x040 // Shape is flipped horizontally -#define SHAPEFLAG_FLIPV 0x080 // Shape is flipped vertically -#define SHAPEFLAG_CONNECTOR 0x100 // Connector type of shape -#define SHAPEFLAG_HAVEANCHOR 0x200 // Shape has an anchor of some kind -#define SHAPEFLAG_BACKGROUND 0x400 // Background shape -#define SHAPEFLAG_HAVESPT 0x800 // Shape has a shape type property - -#define ESCHER_ShpInst_Min 0 -#define ESCHER_ShpInst_NotPrimitive ESCHER_ShpInst_Min -#define ESCHER_ShpInst_Rectangle 1 -#define ESCHER_ShpInst_RoundRectangle 2 -#define ESCHER_ShpInst_Ellipse 3 -#define ESCHER_ShpInst_Diamond 4 -#define ESCHER_ShpInst_IsocelesTriangle 5 -#define ESCHER_ShpInst_RightTriangle 6 -#define ESCHER_ShpInst_Parallelogram 7 -#define ESCHER_ShpInst_Trapezoid 8 -#define ESCHER_ShpInst_Hexagon 9 -#define ESCHER_ShpInst_Octagon 10 -#define ESCHER_ShpInst_Plus 11 -#define ESCHER_ShpInst_Star 12 -#define ESCHER_ShpInst_Arrow 13 -#define ESCHER_ShpInst_ThickArrow 14 -#define ESCHER_ShpInst_HomePlate 15 -#define ESCHER_ShpInst_Cube 16 -#define ESCHER_ShpInst_Balloon 17 -#define ESCHER_ShpInst_Seal 18 -#define ESCHER_ShpInst_Arc 19 -#define ESCHER_ShpInst_Line 20 -#define ESCHER_ShpInst_Plaque 21 -#define ESCHER_ShpInst_Can 22 -#define ESCHER_ShpInst_Donut 23 -#define ESCHER_ShpInst_TextSimple 24 -#define ESCHER_ShpInst_TextOctagon 25 -#define ESCHER_ShpInst_TextHexagon 26 -#define ESCHER_ShpInst_TextCurve 27 -#define ESCHER_ShpInst_TextWave 28 -#define ESCHER_ShpInst_TextRing 29 -#define ESCHER_ShpInst_TextOnCurve 30 -#define ESCHER_ShpInst_TextOnRing 31 -#define ESCHER_ShpInst_StraightConnector1 32 -#define ESCHER_ShpInst_BentConnector2 33 -#define ESCHER_ShpInst_BentConnector3 34 -#define ESCHER_ShpInst_BentConnector4 35 -#define ESCHER_ShpInst_BentConnector5 36 -#define ESCHER_ShpInst_CurvedConnector2 37 -#define ESCHER_ShpInst_CurvedConnector3 38 -#define ESCHER_ShpInst_CurvedConnector4 39 -#define ESCHER_ShpInst_CurvedConnector5 40 -#define ESCHER_ShpInst_Callout1 41 -#define ESCHER_ShpInst_Callout2 42 -#define ESCHER_ShpInst_Callout3 43 -#define ESCHER_ShpInst_AccentCallout1 44 -#define ESCHER_ShpInst_AccentCallout2 45 -#define ESCHER_ShpInst_AccentCallout3 46 -#define ESCHER_ShpInst_BorderCallout1 47 -#define ESCHER_ShpInst_BorderCallout2 48 -#define ESCHER_ShpInst_BorderCallout3 49 -#define ESCHER_ShpInst_AccentBorderCallout1 50 -#define ESCHER_ShpInst_AccentBorderCallout2 51 -#define ESCHER_ShpInst_AccentBorderCallout3 52 -#define ESCHER_ShpInst_Ribbon 53 -#define ESCHER_ShpInst_Ribbon2 54 -#define ESCHER_ShpInst_Chevron 55 -#define ESCHER_ShpInst_Pentagon 56 -#define ESCHER_ShpInst_NoSmoking 57 -#define ESCHER_ShpInst_Seal8 58 -#define ESCHER_ShpInst_Seal16 59 -#define ESCHER_ShpInst_Seal32 60 -#define ESCHER_ShpInst_WedgeRectCallout 61 -#define ESCHER_ShpInst_WedgeRRectCallout 62 -#define ESCHER_ShpInst_WedgeEllipseCallout 63 -#define ESCHER_ShpInst_Wave 64 -#define ESCHER_ShpInst_FoldedCorner 65 -#define ESCHER_ShpInst_LeftArrow 66 -#define ESCHER_ShpInst_DownArrow 67 -#define ESCHER_ShpInst_UpArrow 68 -#define ESCHER_ShpInst_LeftRightArrow 69 -#define ESCHER_ShpInst_UpDownArrow 70 -#define ESCHER_ShpInst_IrregularSeal1 71 -#define ESCHER_ShpInst_IrregularSeal2 72 -#define ESCHER_ShpInst_LightningBolt 73 -#define ESCHER_ShpInst_Heart 74 -#define ESCHER_ShpInst_PictureFrame 75 -#define ESCHER_ShpInst_QuadArrow 76 -#define ESCHER_ShpInst_LeftArrowCallout 77 -#define ESCHER_ShpInst_RightArrowCallout 78 -#define ESCHER_ShpInst_UpArrowCallout 79 -#define ESCHER_ShpInst_DownArrowCallout 80 -#define ESCHER_ShpInst_LeftRightArrowCallout 81 -#define ESCHER_ShpInst_UpDownArrowCallout 82 -#define ESCHER_ShpInst_QuadArrowCallout 83 -#define ESCHER_ShpInst_Bevel 84 -#define ESCHER_ShpInst_LeftBracket 85 -#define ESCHER_ShpInst_RightBracket 86 -#define ESCHER_ShpInst_LeftBrace 87 -#define ESCHER_ShpInst_RightBrace 88 -#define ESCHER_ShpInst_LeftUpArrow 89 -#define ESCHER_ShpInst_BentUpArrow 90 -#define ESCHER_ShpInst_BentArrow 91 -#define ESCHER_ShpInst_Seal24 92 -#define ESCHER_ShpInst_StripedRightArrow 93 -#define ESCHER_ShpInst_NotchedRightArrow 94 -#define ESCHER_ShpInst_BlockArc 95 -#define ESCHER_ShpInst_SmileyFace 96 -#define ESCHER_ShpInst_VerticalScroll 97 -#define ESCHER_ShpInst_HorizontalScroll 98 -#define ESCHER_ShpInst_CircularArrow 99 -#define ESCHER_ShpInst_NotchedCircularArrow 100 -#define ESCHER_ShpInst_UturnArrow 101 -#define ESCHER_ShpInst_CurvedRightArrow 102 -#define ESCHER_ShpInst_CurvedLeftArrow 103 -#define ESCHER_ShpInst_CurvedUpArrow 104 -#define ESCHER_ShpInst_CurvedDownArrow 105 -#define ESCHER_ShpInst_CloudCallout 106 -#define ESCHER_ShpInst_EllipseRibbon 107 -#define ESCHER_ShpInst_EllipseRibbon2 108 -#define ESCHER_ShpInst_FlowChartProcess 109 -#define ESCHER_ShpInst_FlowChartDecision 110 -#define ESCHER_ShpInst_FlowChartInputOutput 111 -#define ESCHER_ShpInst_FlowChartPredefinedProcess 112 -#define ESCHER_ShpInst_FlowChartInternalStorage 113 -#define ESCHER_ShpInst_FlowChartDocument 114 -#define ESCHER_ShpInst_FlowChartMultidocument 115 -#define ESCHER_ShpInst_FlowChartTerminator 116 -#define ESCHER_ShpInst_FlowChartPreparation 117 -#define ESCHER_ShpInst_FlowChartManualInput 118 -#define ESCHER_ShpInst_FlowChartManualOperation 119 -#define ESCHER_ShpInst_FlowChartConnector 120 -#define ESCHER_ShpInst_FlowChartPunchedCard 121 -#define ESCHER_ShpInst_FlowChartPunchedTape 122 -#define ESCHER_ShpInst_FlowChartSummingJunction 123 -#define ESCHER_ShpInst_FlowChartOr 124 -#define ESCHER_ShpInst_FlowChartCollate 125 -#define ESCHER_ShpInst_FlowChartSort 126 -#define ESCHER_ShpInst_FlowChartExtract 127 -#define ESCHER_ShpInst_FlowChartMerge 128 -#define ESCHER_ShpInst_FlowChartOfflineStorage 129 -#define ESCHER_ShpInst_FlowChartOnlineStorage 130 -#define ESCHER_ShpInst_FlowChartMagneticTape 131 -#define ESCHER_ShpInst_FlowChartMagneticDisk 132 -#define ESCHER_ShpInst_FlowChartMagneticDrum 133 -#define ESCHER_ShpInst_FlowChartDisplay 134 -#define ESCHER_ShpInst_FlowChartDelay 135 -#define ESCHER_ShpInst_TextPlainText 136 -#define ESCHER_ShpInst_TextStop 137 -#define ESCHER_ShpInst_TextTriangle 138 -#define ESCHER_ShpInst_TextTriangleInverted 139 -#define ESCHER_ShpInst_TextChevron 140 -#define ESCHER_ShpInst_TextChevronInverted 141 -#define ESCHER_ShpInst_TextRingInside 142 -#define ESCHER_ShpInst_TextRingOutside 143 -#define ESCHER_ShpInst_TextArchUpCurve 144 -#define ESCHER_ShpInst_TextArchDownCurve 145 -#define ESCHER_ShpInst_TextCircleCurve 146 -#define ESCHER_ShpInst_TextButtonCurve 147 -#define ESCHER_ShpInst_TextArchUpPour 148 -#define ESCHER_ShpInst_TextArchDownPour 149 -#define ESCHER_ShpInst_TextCirclePour 150 -#define ESCHER_ShpInst_TextButtonPour 151 -#define ESCHER_ShpInst_TextCurveUp 152 -#define ESCHER_ShpInst_TextCurveDown 153 -#define ESCHER_ShpInst_TextCascadeUp 154 -#define ESCHER_ShpInst_TextCascadeDown 155 -#define ESCHER_ShpInst_TextWave1 156 -#define ESCHER_ShpInst_TextWave2 157 -#define ESCHER_ShpInst_TextWave3 158 -#define ESCHER_ShpInst_TextWave4 159 -#define ESCHER_ShpInst_TextInflate 160 -#define ESCHER_ShpInst_TextDeflate 161 -#define ESCHER_ShpInst_TextInflateBottom 162 -#define ESCHER_ShpInst_TextDeflateBottom 163 -#define ESCHER_ShpInst_TextInflateTop 164 -#define ESCHER_ShpInst_TextDeflateTop 165 -#define ESCHER_ShpInst_TextDeflateInflate 166 -#define ESCHER_ShpInst_TextDeflateInflateDeflate 167 -#define ESCHER_ShpInst_TextFadeRight 168 -#define ESCHER_ShpInst_TextFadeLeft 169 -#define ESCHER_ShpInst_TextFadeUp 170 -#define ESCHER_ShpInst_TextFadeDown 171 -#define ESCHER_ShpInst_TextSlantUp 172 -#define ESCHER_ShpInst_TextSlantDown 173 -#define ESCHER_ShpInst_TextCanUp 174 -#define ESCHER_ShpInst_TextCanDown 175 -#define ESCHER_ShpInst_FlowChartAlternateProcess 176 -#define ESCHER_ShpInst_FlowChartOffpageConnector 177 -#define ESCHER_ShpInst_Callout90 178 -#define ESCHER_ShpInst_AccentCallout90 179 -#define ESCHER_ShpInst_BorderCallout90 180 -#define ESCHER_ShpInst_AccentBorderCallout90 181 -#define ESCHER_ShpInst_LeftRightUpArrow 182 -#define ESCHER_ShpInst_Sun 183 -#define ESCHER_ShpInst_Moon 184 -#define ESCHER_ShpInst_BracketPair 185 -#define ESCHER_ShpInst_BracePair 186 -#define ESCHER_ShpInst_Seal4 187 -#define ESCHER_ShpInst_DoubleWave 188 -#define ESCHER_ShpInst_ActionButtonBlank 189 -#define ESCHER_ShpInst_ActionButtonHome 190 -#define ESCHER_ShpInst_ActionButtonHelp 191 -#define ESCHER_ShpInst_ActionButtonInformation 192 -#define ESCHER_ShpInst_ActionButtonForwardNext 193 -#define ESCHER_ShpInst_ActionButtonBackPrevious 194 -#define ESCHER_ShpInst_ActionButtonEnd 195 -#define ESCHER_ShpInst_ActionButtonBeginning 196 -#define ESCHER_ShpInst_ActionButtonReturn 197 -#define ESCHER_ShpInst_ActionButtonDocument 198 -#define ESCHER_ShpInst_ActionButtonSound 199 -#define ESCHER_ShpInst_ActionButtonMovie 200 -#define ESCHER_ShpInst_HostControl 201 -#define ESCHER_ShpInst_TextBox 202 - -#define ESCHER_ShpInst_COUNT 203 -#define ESCHER_ShpInst_Max 0x0FFF -#define ESCHER_ShpInst_Nil ESCHER_ShpInst_Max - -enum ESCHER_BlibType -{ // GEL provided types... - ERROR = 0, // An error occured during loading - UNKNOWN, // An unknown blip type - EMF, // Windows Enhanced Metafile - WMF, // Windows Metafile - PICT, // Macintosh PICT - PEG, // JFIF - PNG, // PNG - DIB, // Windows DIB - FirstClient = 32, // First client defined blip type - LastClient = 255 // Last client defined blip type -}; - -enum ESCHER_FillStyle -{ - ESCHER_FillSolid, // Fill with a solid color - ESCHER_FillPattern, // Fill with a pattern (bitmap) - ESCHER_FillTexture, // A texture (pattern with its own color map) - ESCHER_FillPicture, // Center a picture in the shape - ESCHER_FillShade, // Shade from start to end points - ESCHER_FillShadeCenter, // Shade from bounding rectangle to end point - ESCHER_FillShadeShape, // Shade from shape outline to end point - ESCHER_FillShadeScale, - ESCHER_FillShadeTitle, - ESCHER_FillBackground -}; - -enum ESCHER_wMode -{ - ESCHER_wColor, // only used for predefined shades - ESCHER_wAutomatic, // depends on object type - ESCHER_wGrayScale, // shades of gray only - ESCHER_wLightGrayScale, // shades of light gray only - ESCHER_wInverseGray, // dark gray mapped to light gray, etc. - ESCHER_wGrayOutline, // pure gray and white - ESCHER_wBlackTextLine, // black text and lines, all else grayscale - ESCHER_wHighContrast, // pure black and white mode (no grays) - ESCHER_wBlack, // solid black msobwWhite, // solid white - ESCHER_wDontShow, // object not drawn - ESCHER_wNumModes // number of Black and white modes -}; - - -// -enum ESCHER_ShapePath -{ - ESCHER_ShapeLines, // A line of straight segments - ESCHER_ShapeLinesClosed, // A closed polygonal object - ESCHER_ShapeCurves, // A line of Bezier curve segments - ESCHER_ShapeCurvesClosed, // A closed shape with curved edges - ESCHER_ShapeComplex // pSegmentInfo must be non-empty -}; - - -enum ESCHER_WrapMode -{ - ESCHER_WrapSquare, - ESCHER_WrapByPoints, - ESCHER_WrapNone, - ESCHER_WrapTopBottom, - ESCHER_WrapThrough -}; - -// -enum ESCHER_bwMode -{ - ESCHER_bwColor, // only used for predefined shades - ESCHER_bwAutomatic, // depends on object type - ESCHER_bwGrayScale, // shades of gray only - ESCHER_bwLightGrayScale, // shades of light gray only - ESCHER_bwInverseGray, // dark gray mapped to light gray, etc. - ESCHER_bwGrayOutline, // pure gray and white - ESCHER_bwBlackTextLine, // black text and lines, all else grayscale - ESCHER_bwHighContrast, // pure black and white mode (no grays) - ESCHER_bwBlack, // solid black - ESCHER_bwWhite, // solid white - ESCHER_bwDontShow, // object not drawn - ESCHER_bwNumModes // number of Black and white modes -}; - - -enum ESCHER_AnchorText -{ - ESCHER_AnchorTop, - ESCHER_AnchorMiddle, - ESCHER_AnchorBottom, - ESCHER_AnchorTopCentered, - ESCHER_AnchorMiddleCentered, - ESCHER_AnchorBottomCentered, - ESCHER_AnchorTopBaseline, - ESCHER_AnchorBottomBaseline, - ESCHER_AnchorTopCenteredBaseline, - ESCHER_AnchorBottomCenteredBaseline -}; - -enum ESCHER_cDir -{ - ESCHER_cDir0, // Right - ESCHER_cDir90, // Down - ESCHER_cDir180, // Left - ESCHER_cDir270 // Up -}; - -// connector style -enum ESCHER_cxSTYLE -{ - ESCHER_cxstyleStraight = 0, - ESCHER_cxstyleBent, - ESCHER_cxstyleCurved, - ESCHER_cxstyleNone -}; - -// text flow -enum ESCHER_txfl -{ - ESCHER_txflHorzN, // Horizontal non-@ - ESCHER_txflTtoBA, // Top to Bottom @-font - ESCHER_txflBtoT, // Bottom to Top non-@ - ESCHER_txflTtoBN, // Top to Bottom non-@ - ESCHER_txflHorzA, // Horizontal @-font - ESCHER_txflVertN // Vertical, non-@ -}; - -// text direction (needed for Bi-Di support) -enum ESCHER_txDir -{ - ESCHER_txdirLTR, // left-to-right text direction - ESCHER_txdirRTL, // right-to-left text direction - ESCHER_txdirContext // context text direction -}; - -// Callout Type -enum ESCHER_spcot -{ - ESCHER_spcotRightAngle = 1, - ESCHER_spcotOneSegment = 2, - ESCHER_spcotTwoSegment = 3, - ESCHER_spcotThreeSegment = 4 -}; - -// Callout Angle -enum ESCHER_spcoa -{ - ESCHER_spcoaAny, - ESCHER_spcoa30, - ESCHER_spcoa45, - ESCHER_spcoa60, - ESCHER_spcoa90, - ESCHER_spcoa0 -}; - -// Callout Drop -enum ESCHER_spcod -{ - ESCHER_spcodTop, - ESCHER_spcodCenter, - ESCHER_spcodBottom, - ESCHER_spcodSpecified -}; - -// FontWork alignment -enum ESCHER_GeoTextAlign -{ - ESCHER_AlignTextStretch, /* Stretch each line of text to fit width. */ - ESCHER_AlignTextCenter, /* Center text on width. */ - ESCHER_AlignTextLeft, /* Left justify. */ - ESCHER_AlignTextRight, /* Right justify. */ - ESCHER_AlignTextLetterJust, /* Spread letters out to fit width. */ - ESCHER_AlignTextWordJust, /* Spread words out to fit width. */ - ESCHER_AlignTextInvalid /* Invalid */ -}; - -// flags for pictures -enum ESCHER_BlipFlags -{ - ESCHER_BlipFlagDefault = 0, - ESCHER_BlipFlagComment = 0, // Blip name is a comment - ESCHER_BlipFlagFile, // Blip name is a file name - ESCHER_BlipFlagURL, // Blip name is a full URL - ESCHER_BlipFlagType = 3, // Mask to extract type - /* Or the following flags with any of the above. */ - ESCHER_BlipFlagDontSave = 4, // A "dont" is the depression in the metal - // body work of an automobile caused when a - // cyclist violently thrusts his or her nose - // at it, thus a DontSave is another name for - // a cycle lane. - ESCHER_BlipFlagDoNotSave = 4, // For those who prefer English - ESCHER_BlipFlagLinkToFile = 8 -}; - -// -enum ESCHER_3DRenderMode -{ - ESCHER_FullRender, // Generate a full rendering - ESCHER_Wireframe, // Generate a wireframe - ESCHER_BoundingCube // Generate a bounding cube -}; - -// -enum ESCHER_xFormType -{ - ESCHER_xFormAbsolute, // Apply transform in absolute space centered on shape - ESCHER_xFormShape, // Apply transform to shape geometry - ESCHER_xFormDrawing // Apply transform in drawing space -}; - -// -enum ESCHER_ShadowType -{ - ESCHER_ShadowOffset, // N pixel offset shadow - ESCHER_ShadowDouble, // Use second offset too - ESCHER_ShadowRich, // Rich perspective shadow (cast relative to shape) - ESCHER_ShadowShape, // Rich perspective shadow (cast in shape space) - ESCHER_ShadowDrawing, // Perspective shadow cast in drawing space - ESCHER_ShadowEmbossOrEngrave -}; - -// - the type of a (length) measurement -enum ESCHER_dzType - { - ESCHER_dzTypeMin = 0, - ESCHER_dzTypeDefault = 0, // Default size, ignore the values - ESCHER_dzTypeA = 1, // Values are in EMUs - ESCHER_dzTypeV = 2, // Values are in pixels - ESCHER_dzTypeShape = 3, // Values are 16.16 fractions of shape size - ESCHER_dzTypeFixedAspect = 4, // Aspect ratio is fixed - ESCHER_dzTypeAFixed = 5, // EMUs, fixed aspect ratio - ESCHER_dzTypeVFixed = 6, // Pixels, fixed aspect ratio - ESCHER_dzTypeShapeFixed = 7, // Proportion of shape, fixed aspect ratio - ESCHER_dzTypeFixedAspectEnlarge= 8, // Aspect ratio is fixed, favor larger size - ESCHER_dzTypeAFixedBig = 9, // EMUs, fixed aspect ratio - ESCHER_dzTypeVFixedBig = 10, // Pixels, fixed aspect ratio - ESCHER_dzTypeShapeFixedBig= 11, // Proportion of shape, fixed aspect ratio - ESCHER_dzTypeMax = 11 -}; - -// how to interpret the colors in a shaded fill. -enum ESCHER_ShadeType -{ - ESCHER_ShadeNone = 0, // Interpolate without correction between RGBs - ESCHER_ShadeGamma = 1, // Apply gamma correction to colors - ESCHER_ShadeSigma = 2, // Apply a sigma transfer function to position - ESCHER_ShadeBand = 4, // Add a flat band at the start of the shade - ESCHER_ShadeOneColor = 8, // This is a one color shade - - /* A parameter for the band or sigma function can be stored in the top - 16 bits of the value - this is a proportion of *each* band of the - shade to make flat (or the approximate equal value for a sigma - function). NOTE: the parameter is not used for the sigma function, - instead a built in value is used. This value should not be changed - from the default! */ - ESCHER_ShadeParameterShift = 16, - ESCHER_ShadeParameterMask = 0xffff0000, - - ESCHER_ShadeDefault = (ESCHER_ShadeGamma|ESCHER_ShadeSigma| - (16384<<ESCHER_ShadeParameterShift)) -}; - -// compound line style -enum ESCHER_LineStyle -{ - ESCHER_LineSimple, // Single line (of width lineWidth) - ESCHER_LineDouble, // Double lines of equal width - ESCHER_LineThickThin, // Double lines, one thick, one thin - ESCHER_LineThinThick, // Double lines, reverse order - ESCHER_LineTriple // Three lines, thin, thick, thin -}; - -// how to "fill" the line contour -enum ESCHER_LineType -{ - ESCHER_lineSolidType, // Fill with a solid color - ESCHER_linePattern, // Fill with a pattern (bitmap) - ESCHER_lineTexture, // A texture (pattern with its own color map) - ESCHER_linePicture // Center a picture in the shape -}; - -// dashed line style -enum ESCHER_LineDashing -{ - ESCHER_LineSolid, // Solid (continuous) pen - ESCHER_LineDashSys, // PS_DASH system dash style - ESCHER_LineDotSys, // PS_DOT system dash style - ESCHER_LineDashDotSys, // PS_DASHDOT system dash style - ESCHER_LineDashDotDotSys, // PS_DASHDOTDOT system dash style - ESCHER_LineDotGEL, // square dot style - ESCHER_LineDashGEL, // dash style - ESCHER_LineLongDashGEL, // long dash style - ESCHER_LineDashDotGEL, // dash short dash - ESCHER_LineLongDashDotGEL, // long dash short dash - ESCHER_LineLongDashDotDotGEL // long dash short dash short dash -}; - -// line end effect -enum ESCHER_LineEnd -{ - ESCHER_LineNoEnd, - ESCHER_LineArrowEnd, - ESCHER_LineArrowStealthEnd, - ESCHER_LineArrowDiamondEnd, - ESCHER_LineArrowOvalEnd, - ESCHER_LineArrowOpenEnd -}; - -// size of arrowhead -enum ESCHER_LineWidth -{ - ESCHER_LineNarrowArrow, - ESCHER_LineMediumWidthArrow, - ESCHER_LineWideArrow -}; - -// size of arrowhead -enum ESCHER_LineEndLenght -{ - ESCHER_LineShortArrow, - ESCHER_LineMediumLenArrow, - ESCHER_LineLongArrow -}; - -// line join style. -enum ESCHER_LineJoin -{ - ESCHER_LineJoinBevel, // Join edges by a straight line - ESCHER_LineJoinMiter, // Extend edges until they join - ESCHER_LineJoinRound // Draw an arc between the two edges -}; - -// line cap style (applies to ends of dash segments too). -enum ESCHER_LineCap -{ - ESCHER_LineEndCapRound, // Rounded ends - the default - ESCHER_LineEndCapSquare, // Square protrudes by half line width - ESCHER_LineEndCapFlat // Line ends at end point -}; -// Shape Properties -// 1pt = 12700 EMU (English Metric Units) -// 1pt = 20 Twip = 20/1440" = 1/72" -// 1twip=635 EMU -// 1" = 12700*72 = 914400 EMU -// 1" = 25.4mm -// 1mm = 36000 EMU -// Transform -#define ESCHER_Prop_Rotation 4 /* Fixed Point 16.16 degrees */ -// Protection -#define ESCHER_Prop_LockRotation 119 /* BOOL No rotation */ -#define ESCHER_Prop_LockAspectRatio 120 /* BOOL Don't allow changes in aspect ratio */ -#define ESCHER_Prop_LockPosition 121 /* BOOL Don't allow the shape to be moved */ -#define ESCHER_Prop_LockAgainstSelect 122 /* BOOL Shape may not be selected */ -#define ESCHER_Prop_LockCropping 123 /* BOOL No cropping this shape */ -#define ESCHER_Prop_LockVertices 124 /* BOOL Edit Points not allowed */ -#define ESCHER_Prop_LockText 125 /* BOOL Do not edit text */ -#define ESCHER_Prop_LockAdjustHandles 126 /* BOOL Do not adjust */ -#define ESCHER_Prop_LockAgainstGrouping 127 /* BOOL Do not group this shape */ -// Text -#define ESCHER_Prop_lTxid 128 /* LONG id for the text, value determined by the host */ -#define ESCHER_Prop_dxTextLeft 129 /* LONG margins relative to shape's inscribed */ -#define ESCHER_Prop_dyTextTop 130 /* LONG text rectangle (in EMUs) */ -#define ESCHER_Prop_dxTextRight 131 /* LONG */ -#define ESCHER_Prop_dyTextBottom 132 /* LONG */ -#define ESCHER_Prop_WrapText 133 /* MSOWRAPMODE Wrap text at shape margins */ -#define ESCHER_Prop_scaleText 134 /* LONG Text zoom/scale (used if fFitTextToShape) */ -#define ESCHER_Prop_AnchorText 135 /* ESCHER_AnchorText How to anchor the text */ -#define ESCHER_Prop_txflTextFlow 136 /* MSOTXFL Text flow */ -#define ESCHER_Prop_cdirFont 137 /* MSOCDIR Font rotation */ -#define ESCHER_Prop_hspNext 138 /* MSOHSP ID of the next shape (used by Word for linked textboxes) */ -#define ESCHER_Prop_txdir 139 /* MSOTXDIR Bi-Di Text direction */ -#define ESCHER_Prop_SelectText 187 /* BOOL TRUE if single click selects text, FALSE if two clicks */ -#define ESCHER_Prop_AutoTextMargin 188 /* BOOL use host's margin calculations */ -#define ESCHER_Prop_RotateText 189 /* BOOL Rotate text with shape */ -#define ESCHER_Prop_FitShapeToText 190 /* BOOL Size shape to fit text size */ -#define ESCHER_Prop_FitTextToShape 191 /* BOOL Size text to fit shape size */ -// GeoText -#define ESCHER_Prop_gtextUNICODE 192 /* WCHAR* UNICODE text string */ -#define ESCHER_Prop_gtextRTF 193 /* char* RTF text string */ -#define ESCHER_Prop_gtextAlign 194 /* MSOGEOTEXTALIGN alignment on curve */ -#define ESCHER_Prop_gtextSize 195 /* LONG default point size */ -#define ESCHER_Prop_gtextSpacing 196 /* LONG fixed point 16.16 */ -#define ESCHER_Prop_gtextFont 197 /* WCHAR* font family name */ -#define ESCHER_Prop_gtextFReverseRows 240 /* BOOL Reverse row order */ -#define ESCHER_Prop_fGtext 241 /* BOOL Has text effect */ -#define ESCHER_Prop_gtextFVertical 242 /* BOOL Rotate characters */ -#define ESCHER_Prop_gtextFKern 243 /* BOOL Kern characters */ -#define ESCHER_Prop_gtextFTight 244 /* BOOL Tightening or tracking */ -#define ESCHER_Prop_gtextFStretch 245 /* BOOL Stretch to fit shape */ -#define ESCHER_Prop_gtextFShrinkFit 246 /* BOOL Char bounding box */ -#define ESCHER_Prop_gtextFBestFit 247 /* BOOL Scale text-on-path */ -#define ESCHER_Prop_gtextFNormalize 248 /* BOOL Stretch char height */ -#define ESCHER_Prop_gtextFDxMeasure 249 /* BOOL Do not measure along path */ -#define ESCHER_Prop_gtextFBold 250 /* BOOL Bold font */ -#define ESCHER_Prop_gtextFItalic 251 /* BOOL Italic font */ -#define ESCHER_Prop_gtextFUnderline 252 /* BOOL Underline font */ -#define ESCHER_Prop_gtextFShadow 253 /* BOOL Shadow font */ -#define ESCHER_Prop_gtextFSmallcaps 254 /* BOOL Small caps font */ -#define ESCHER_Prop_gtextFStrikethrough 255 /* BOOL Strike through font */ -// Blip -#define ESCHER_Prop_cropFromTop 256 /* LONG 16.16 fraction times total */ -#define ESCHER_Prop_cropFromBottom 257 /* LONG image width or height, */ -#define ESCHER_Prop_cropFromLeft 258 /* LONG as appropriate. */ -#define ESCHER_Prop_cropFromRight 259 /* LONG */ -#define ESCHER_Prop_pib 260 /* IMsoBlip* Blip to display */ -#define ESCHER_Prop_pibName 261 /* WCHAR* Blip file name */ -#define ESCHER_Prop_pibFlags 262 /* MSOBLIPFLAGS Blip flags */ -#define ESCHER_Prop_pictureTransparent 263 /* LONG transparent color (none if ~0UL) */ -#define ESCHER_Prop_pictureContrast 264 /* LONG contrast setting */ -#define ESCHER_Prop_pictureBrightness 265 /* LONG brightness setting */ -#define ESCHER_Prop_pictureGamma 266 /* LONG 16.16 gamma */ -#define ESCHER_Prop_pictureId 267 /* LONG Host-defined ID for OLE objects (usually a pointer) */ -#define ESCHER_Prop_pictureDblCrMod 268 /* MSOCLR Modification used if shape has double shadow */ -#define ESCHER_Prop_pictureFillCrMod 269 /* MSOCLR */ -#define ESCHER_Prop_pictureLineCrMod 270 /* MSOCLR */ -#define ESCHER_Prop_pibPrint 271 /* IMsoBlip* Blip to display when printing */ -#define ESCHER_Prop_pibPrintName 272 /* WCHAR* Blip file name */ -#define ESCHER_Prop_pibPrintFlags 273 /* MSOBLIPFLAGS Blip flags */ -#define ESCHER_Prop_fNoHitTestPicture 316 /* BOOL Do not hit test the picture */ -#define ESCHER_Prop_pictureGray 317 /* BOOL grayscale display */ -#define ESCHER_Prop_pictureBiLevel 318 /* BOOL bi-level display */ -#define ESCHER_Prop_pictureActive 319 /* BOOL Server is active (OLE objects only) */ -// Geometry -#define ESCHER_Prop_geoLeft 320 /* LONG Defines the G (geometry) coordinate space. */ -#define ESCHER_Prop_geoTop 321 /* LONG */ -#define ESCHER_Prop_geoRight 322 /* LONG */ -#define ESCHER_Prop_geoBottom 323 /* LONG */ -#define ESCHER_Prop_shapePath 324 /* MSOSHAPEPATH */ -#define ESCHER_Prop_pVertices 325 /* IMsoArray An array of points, in G units. */ -#define ESCHER_Prop_pSegmentInfo 326 /* IMsoArray */ -#define ESCHER_Prop_adjustValue 327 /* LONG Adjustment values corresponding to */ -#define ESCHER_Prop_adjust2Value 328 /* LONG the positions of the adjust handles */ -#define ESCHER_Prop_adjust3Value 329 /* LONG of the shape. The number of values */ -#define ESCHER_Prop_adjust4Value 330 /* LONG used and their allowable ranges vary */ -#define ESCHER_Prop_adjust5Value 331 /* LONG from shape type to shape type. */ -#define ESCHER_Prop_adjust6Value 332 /* LONG */ -#define ESCHER_Prop_adjust7Value 333 /* LONG */ -#define ESCHER_Prop_adjust8Value 334 /* LONG */ -#define ESCHER_Prop_adjust9Value 335 /* LONG */ -#define ESCHER_Prop_adjust10Value 336 /* LONG */ -#define ESCHER_Prop_fShadowOK 378 /* BOOL Shadow may be set */ -#define ESCHER_Prop_f3DOK 379 /* BOOL 3D may be set */ -#define ESCHER_Prop_fLineOK 380 /* BOOL Line style may be set */ -#define ESCHER_Prop_fGtextOK 381 /* BOOL Text effect (FontWork) supported */ -#define ESCHER_Prop_fFillShadeShapeOK 382 /* BOOL */ -#define ESCHER_Prop_fFillOK 383 /* BOOL OK to fill the shape through the UI or VBA? */ -// FillStyle -#define ESCHER_Prop_fillType 384 /* ESCHER_FillStyle Type of fill */ -#define ESCHER_Prop_fillColor 385 /* MSOCLR Foreground color */ -#define ESCHER_Prop_fillOpacity 386 /* LONG Fixed 16.16 */ -#define ESCHER_Prop_fillBackColor 387 /* MSOCLR Background color */ -#define ESCHER_Prop_fillBackOpacity 388 /* LONG Shades only */ -#define ESCHER_Prop_fillCrMod 389 /* MSOCLR Modification for BW views */ -#define ESCHER_Prop_fillBlip 390 /* IMsoBlip* Pattern/texture */ -#define ESCHER_Prop_fillBlipName 391 /* WCHAR* Blip file name */ -#define ESCHER_Prop_fillBlipFlags 392 /* MSOBLIPFLAGS Blip flags */ -#define ESCHER_Prop_fillWidth 393 /* LONG How big (A units) to make a metafile texture. */ -#define ESCHER_Prop_fillHeight 394 /* LONG */ -#define ESCHER_Prop_fillAngle 395 /* LONG Fade angle - degrees in 16.16 */ -#define ESCHER_Prop_fillFocus 396 /* LONG Linear shaded fill focus percent */ -#define ESCHER_Prop_fillToLeft 397 /* LONG Fraction 16.16 */ -#define ESCHER_Prop_fillToTop 398 /* LONG Fraction 16.16 */ -#define ESCHER_Prop_fillToRight 399 /* LONG Fraction 16.16 */ -#define ESCHER_Prop_fillToBottom 400 /* LONG Fraction 16.16 */ -#define ESCHER_Prop_fillRectLeft 401 /* LONG For shaded fills, use the specified rectangle */ -#define ESCHER_Prop_fillRectTop 402 /* LONG instead of the shape's bounding rect to */ -#define ESCHER_Prop_fillRectRight 403 /* LONG define how large the fade is going to be. */ -#define ESCHER_Prop_fillRectBottom 404 /* LONG */ -#define ESCHER_Prop_fillDztype 405 /* MSODZTYPE */ -#define ESCHER_Prop_fillShadePreset 406 /* LONG Special shades */ -#define ESCHER_Prop_fillShadeColors 407 /* IMsoArray a preset array of colors */ -#define ESCHER_Prop_fillOriginX 408 /* LONG */ -#define ESCHER_Prop_fillOriginY 409 /* LONG */ -#define ESCHER_Prop_fillShapeOriginX 410 /* LONG */ -#define ESCHER_Prop_fillShapeOriginY 411 /* LONG */ -#define ESCHER_Prop_fillShadeType 412 /* MSOSHADETYPE Type of shading, if a shaded (gradient) fill. */ -#define ESCHER_Prop_fFilled 443 /* BOOL Is shape filled? */ -#define ESCHER_Prop_fHitTestFill 444 /* BOOL Should we hit test fill? */ -#define ESCHER_Prop_fillShape 445 /* BOOL Register pattern on shape */ -#define ESCHER_Prop_fillUseRect 446 /* BOOL Use the large rect? */ -#define ESCHER_Prop_fNoFillHitTest 447 /* BOOL Hit test a shape as though filled */ -// LineStyle -#define ESCHER_Prop_lineColor 448 /* MSOCLR Color of line */ -#define ESCHER_Prop_lineOpacity 449 /* LONG Not implemented */ -#define ESCHER_Prop_lineBackColor 450 /* MSOCLR Background color */ -#define ESCHER_Prop_lineCrMod 451 /* MSOCLR Modification for BW views */ -#define ESCHER_Prop_lineType 452 /* MSOLINETYPE Type of line */ -#define ESCHER_Prop_lineFillBlip 453 /* IMsoBlip* Pattern/texture */ -#define ESCHER_Prop_lineFillBlipName 454 /* WCHAR* Blip file name */ -#define ESCHER_Prop_lineFillBlipFlags 455 /* MSOBLIPFLAGS Blip flags */ -#define ESCHER_Prop_lineFillWidth 456 /* LONG How big (A units) to make */ -#define ESCHER_Prop_lineFillHeight 457 /* LONG a metafile texture. */ -#define ESCHER_Prop_lineFillDztype 458 /* MSODZTYPE How to interpret fillWidth/Height numbers. */ -#define ESCHER_Prop_lineWidth 459 /* LONG A units; 1pt == 12700 EMUs */ -#define ESCHER_Prop_lineMiterLimit 460 /* LONG ratio (16.16) of width */ -#define ESCHER_Prop_lineStyle 461 /* MSOLINESTYLE Draw parallel lines? */ -#define ESCHER_Prop_lineDashing 462 /* MSOLINEDASHING Can be overridden by: */ -#define ESCHER_Prop_lineDashStyle 463 /* IMsoArray As Win32 ExtCreatePen */ -#define ESCHER_Prop_lineStartArrowhead 464 /* MSOLINEEND Arrow at start */ -#define ESCHER_Prop_lineEndArrowhead 465 /* MSOLINEEND Arrow at end */ -#define ESCHER_Prop_lineStartArrowWidth 466 /* MSOLINEENDWIDTH Arrow at start */ -#define ESCHER_Prop_lineStartArrowLength 467 /* MSOLINEENDLENGTH Arrow at end */ -#define ESCHER_Prop_lineEndArrowWidth 468 /* MSOLINEENDWIDTH Arrow at start */ -#define ESCHER_Prop_lineEndArrowLength 469 /* MSOLINEENDLENGTH Arrow at end */ -#define ESCHER_Prop_lineJoinStyle 470 /* MSOLINEJOIN How to join lines */ -#define ESCHER_Prop_lineEndCapStyle 471 /* MSOLINECAP How to end lines */ -#define ESCHER_Prop_fArrowheadsOK 507 /* BOOL Allow arrowheads if prop. is set */ -#define ESCHER_Prop_fLine 508 /* BOOL Any line? */ -#define ESCHER_Prop_fHitTestLine 509 /* BOOL Should we hit test lines? */ -#define ESCHER_Prop_lineFillShape 510 /* BOOL Register pattern on shape */ -#define ESCHER_Prop_fNoLineDrawDash 511 /* BOOL Draw a dashed line if no line */ -// ShadowStyle -#define ESCHER_Prop_shadowType 512 /* MSOSHADOWTYPE Type of effect */ -#define ESCHER_Prop_shadowColor 513 /* MSOCLR Foreground color */ -#define ESCHER_Prop_shadowHighlight 514 /* MSOCLR Embossed color */ -#define ESCHER_Prop_shadowCrMod 515 /* MSOCLR Modification for BW views */ -#define ESCHER_Prop_shadowOpacity 516 /* LONG Fixed 16.16 */ -#define ESCHER_Prop_shadowOffsetX 517 /* LONG Offset shadow */ -#define ESCHER_Prop_shadowOffsetY 518 /* LONG Offset shadow */ -#define ESCHER_Prop_shadowSecondOffsetX 519 /* LONG Double offset shadow */ -#define ESCHER_Prop_shadowSecondOffsetY 520 /* LONG Double offset shadow */ -#define ESCHER_Prop_shadowScaleXToX 521 /* LONG 16.16 */ -#define ESCHER_Prop_shadowScaleYToX 522 /* LONG 16.16 */ -#define ESCHER_Prop_shadowScaleXToY 523 /* LONG 16.16 */ -#define ESCHER_Prop_shadowScaleYToY 524 /* LONG 16.16 */ -#define ESCHER_Prop_shadowPerspectiveX 525 /* LONG 16.16 / weight */ -#define ESCHER_Prop_shadowPerspectiveY 526 /* LONG 16.16 / weight */ -#define ESCHER_Prop_shadowWeight 527 /* LONG scaling factor */ -#define ESCHER_Prop_shadowOriginX 528 /* LONG */ -#define ESCHER_Prop_shadowOriginY 529 /* LONG */ -#define ESCHER_Prop_fShadow 574 /* BOOL Any shadow? */ -#define ESCHER_Prop_fshadowObscured 575 /* BOOL Excel5-style shadow */ -// PerspectiveStyle -#define ESCHER_Prop_perspectiveType 576 /* MSOXFORMTYPE Where transform applies */ -#define ESCHER_Prop_perspectiveOffsetX 577 /* LONG The LONG values define a */ -#define ESCHER_Prop_perspectiveOffsetY 578 /* LONG transformation matrix, */ -#define ESCHER_Prop_perspectiveScaleXToX 579 /* LONG effectively, each value */ -#define ESCHER_Prop_perspectiveScaleYToX 580 /* LONG is scaled by the */ -#define ESCHER_Prop_perspectiveScaleXToY 581 /* LONG perspectiveWeight parameter. */ -#define ESCHER_Prop_perspectiveScaleYToY 582 /* LONG */ -#define ESCHER_Prop_perspectivePerspectiveX 583 /* LONG */ -#define ESCHER_Prop_perspectivePerspectiveY 584 /* LONG */ -#define ESCHER_Prop_perspectiveWeight 585 /* LONG Scaling factor */ -#define ESCHER_Prop_perspectiveOriginX 586 /* LONG */ -#define ESCHER_Prop_perspectiveOriginY 587 /* LONG */ -#define ESCHER_Prop_fPerspective 639 /* BOOL On/off */ -// 3D Object -#define ESCHER_Prop_c3DSpecularAmt 640 /* LONG Fixed-point 16.16 */ -#define ESCHER_Prop_c3DDiffuseAmt 641 /* LONG Fixed-point 16.16 */ -#define ESCHER_Prop_c3DShininess 642 /* LONG Default gives OK results */ -#define ESCHER_Prop_c3DEdgeThickness 643 /* LONG Specular edge thickness */ -#define ESCHER_Prop_c3DExtrudeForward 644 /* LONG Distance of extrusion in EMUs */ -#define ESCHER_Prop_c3DExtrudeBackward 645 /* LONG */ -#define ESCHER_Prop_c3DExtrudePlane 646 /* LONG Extrusion direction */ -#define ESCHER_Prop_c3DExtrusionColor 647 /* MSOCLR Basic color of extruded part of shape; the lighting model used will determine the exact shades used when rendering. */ -#define ESCHER_Prop_c3DCrMod 648 /* MSOCLR Modification for BW views */ -#define ESCHER_Prop_f3D 700 /* BOOL Does this shape have a 3D effect? */ -#define ESCHER_Prop_fc3DMetallic 701 /* BOOL Use metallic specularity? */ -#define ESCHER_Prop_fc3DUseExtrusionColor 702 /* BOOL */ -#define ESCHER_Prop_fc3DLightFace 703 /* BOOL */ -// 3D Style -#define ESCHER_Prop_c3DYRotationAngle 704 /* LONG degrees (16.16) about y axis */ -#define ESCHER_Prop_c3DXRotationAngle 705 /* LONG degrees (16.16) about x axis */ -#define ESCHER_Prop_c3DRotationAxisX 706 /* LONG These specify the rotation axis; */ -#define ESCHER_Prop_c3DRotationAxisY 707 /* LONG only their relative magnitudes */ -#define ESCHER_Prop_c3DRotationAxisZ 708 /* LONG matter. */ -#define ESCHER_Prop_c3DRotationAngle 709 /* LONG degrees (16.16) about axis */ -#define ESCHER_Prop_c3DRotationCenterX 710 /* LONG rotation center x (16.16 or g-units) */ -#define ESCHER_Prop_c3DRotationCenterY 711 /* LONG rotation center y (16.16 or g-units) */ -#define ESCHER_Prop_c3DRotationCenterZ 712 /* LONG rotation center z (absolute (emus)) */ -#define ESCHER_Prop_c3DRenderMode 713 /* MSO3DRENDERMODE Full,wireframe, or bcube */ -#define ESCHER_Prop_c3DTolerance 714 /* LONG pixels (16.16) */ -#define ESCHER_Prop_c3DXViewpoint 715 /* LONG X view point (emus) */ -#define ESCHER_Prop_c3DYViewpoint 716 /* LONG Y view point (emus) */ -#define ESCHER_Prop_c3DZViewpoint 717 /* LONG Z view distance (emus) */ -#define ESCHER_Prop_c3DOriginX 718 /* LONG */ -#define ESCHER_Prop_c3DOriginY 719 /* LONG */ -#define ESCHER_Prop_c3DSkewAngle 720 /* LONG degree (16.16) skew angle */ -#define ESCHER_Prop_c3DSkewAmount 721 /* LONG Percentage skew amount */ -#define ESCHER_Prop_c3DAmbientIntensity 722 /* LONG Fixed point intensity */ -#define ESCHER_Prop_c3DKeyX 723 /* LONG Key light source direc- */ -#define ESCHER_Prop_c3DKeyY 724 /* LONG tion; only their relative */ -#define ESCHER_Prop_c3DKeyZ 725 /* LONG magnitudes matter */ -#define ESCHER_Prop_c3DKeyIntensity 726 /* LONG Fixed point intensity */ -#define ESCHER_Prop_c3DFillX 727 /* LONG Fill light source direc- */ -#define ESCHER_Prop_c3DFillY 728 /* LONG tion; only their relative */ -#define ESCHER_Prop_c3DFillZ 729 /* LONG magnitudes matter */ -#define ESCHER_Prop_c3DFillIntensity 730 /* LONG Fixed point intensity */ -#define ESCHER_Prop_fc3DConstrainRotation 763 /* BOOL */ -#define ESCHER_Prop_fc3DRotationCenterAuto 764 /* BOOL */ -#define ESCHER_Prop_fc3DParallel 765 /* BOOL Parallel projection? */ -#define ESCHER_Prop_fc3DKeyHarsh 766 /* BOOL Is key lighting harsh? */ -#define ESCHER_Prop_fc3DFillHarsh 767 /* BOOL Is fill lighting harsh? */ -// Shape -#define ESCHER_Prop_hspMaster 769 /* MSOHSP master shape */ -#define ESCHER_Prop_cxstyle 771 /* MSOCXSTYLE Type of connector */ -#define ESCHER_Prop_bWMode 772 /* ESCHERwMode Settings for modifications to */ -#define ESCHER_Prop_bWModePureBW 773 /* ESCHERwMode be made when in different */ -#define ESCHER_Prop_bWModeBW 774 /* ESCHERwMode forms of black-and-white mode. */ -#define ESCHER_Prop_fOleIcon 826 /* BOOL For OLE objects, whether the object is in icon form */ -#define ESCHER_Prop_fPreferRelativeResize 827 /* BOOL For UI only. Prefer relative resizing. */ -#define ESCHER_Prop_fLockShapeType 828 /* BOOL Lock the shape type (don't allow Change Shape) */ -#define ESCHER_Prop_fDeleteAttachedObject 830 /* BOOL */ -#define ESCHER_Prop_fBackground 831 /* BOOL If TRUE, this is the background shape. */ -// Callout -#define ESCHER_Prop_spcot 832 /* MSOSPCOT Callout type */ -#define ESCHER_Prop_dxyCalloutGap 833 /* LONG Distance from box to first point.(EMUs) */ -#define ESCHER_Prop_spcoa 834 /* MSOSPCOA Callout angle */ -#define ESCHER_Prop_spcod 835 /* MSOSPCOD Callout drop type */ -#define ESCHER_Prop_dxyCalloutDropSpecified 836 /* LONG if msospcodSpecified, the actual drop distance */ -#define ESCHER_Prop_dxyCalloutLengthSpecified 837 /* LONG if fCalloutLengthSpecified, the actual distance */ -#define ESCHER_Prop_fCallout 889 /* BOOL Is the shape a callout? */ -#define ESCHER_Prop_fCalloutAccentBar 890 /* BOOL does callout have accent bar */ -#define ESCHER_Prop_fCalloutTextBorder 891 /* BOOL does callout have a text border */ -#define ESCHER_Prop_fCalloutMinusX 892 /* BOOL */ -#define ESCHER_Prop_fCalloutMinusY 893 /* BOOL */ -#define ESCHER_Prop_fCalloutDropAuto 894 /* BOOL If true, then we occasionally invert the drop distance */ -#define ESCHER_Prop_fCalloutLengthSpecified 895 /* BOOL if true, we look at dxyCalloutLengthSpecified */ -// GroupShape -#define ESCHER_Prop_wzName 896 /* WCHAR* Shape Name (present only if explicitly set) */ -#define ESCHER_Prop_wzDescription 897 /* WCHAR* alternate text */ -#define ESCHER_Prop_pihlShape 898 /* IHlink* The hyperlink in the shape. */ -#define ESCHER_Prop_pWrapPolygonVertices 899 /* IMsoArray The polygon that text will be wrapped around (Word) */ -#define ESCHER_Prop_dxWrapDistLeft 900 /* LONG Left wrapping distance from text (Word) */ -#define ESCHER_Prop_dyWrapDistTop 901 /* LONG Top wrapping distance from text (Word) */ -#define ESCHER_Prop_dxWrapDistRight 902 /* LONG Right wrapping distance from text (Word) */ -#define ESCHER_Prop_dyWrapDistBottom 903 /* LONG Bottom wrapping distance from text (Word) */ -#define ESCHER_Prop_lidRegroup 904 /* LONG Regroup ID */ -#define ESCHER_Prop_tableProperties 927 -#define ESCHER_Prop_tableRowProperties 928 -#define ESCHER_Prop_fEditedWrap 953 /* BOOL Has the wrap polygon been edited? */ -#define ESCHER_Prop_fBehindDocument 954 /* BOOL Word-only (shape is behind text) */ -#define ESCHER_Prop_fOnDblClickNotify 955 /* BOOL Notify client on a double click */ -#define ESCHER_Prop_fIsButton 956 /* BOOL A button shape (i.e., clicking performs an action). Set for shapes with attached hyperlinks or macros. */ -#define ESCHER_Prop_fOneD 957 /* BOOL 1D adjustment */ -#define ESCHER_Prop_fHidden 958 /* BOOL Do not display */ -#define ESCHER_Prop_fPrint 959 /* BOOL Print this shape */ - -#define ESCHER_PERSISTENTRY_PREALLOCATE 64 - -#define ESCHER_Persist_PrivateEntry 0x80000000 -#define ESCHER_Persist_Dgg 0x00010000 -#define ESCHER_Persist_Dgg_FIDCL 0x00010001 -#define ESCHER_Persist_Dg 0x00020000 -#define ESCHER_Persist_BlibStoreContainer 0x00030000 -#define ESCHER_Persist_CurrentPosition 0x00040000 -#define ESCHER_Persist_Grouping_Snap 0x00050000 -#define ESCHER_Persist_Grouping_Logic 0x00060000 - -// --------------------------------------------------------------------------------------------- - -namespace com { namespace sun { namespace star { - namespace awt { - struct Gradient; - } - namespace drawing { - struct EnhancedCustomShapeAdjustmentValue; - class XShape; - } -}}} - -struct SVX_DLLPUBLIC EscherConnectorListEntry -{ - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXConnector; - ::com::sun::star::awt::Point maPointA; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXConnectToA; - ::com::sun::star::awt::Point maPointB; - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mXConnectToB; - - sal_uInt32 GetConnectorRule( sal_Bool bFirst ); - - EscherConnectorListEntry( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rC, - const ::com::sun::star::awt::Point& rPA, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rSA , - const ::com::sun::star::awt::Point& rPB, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rSB ) : - mXConnector ( rC ), - maPointA ( rPA ), - mXConnectToA( rSA ), - maPointB ( rPB ), - mXConnectToB( rSB ) {} - - sal_uInt32 GetClosestPoint( const Polygon& rPoly, const ::com::sun::star::awt::Point& rP ); -}; - -struct SVX_DLLPUBLIC EscherExContainer -{ - sal_uInt32 nContPos; - SvStream& rStrm; - - EscherExContainer( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance = 0 ); - ~EscherExContainer(); -}; -struct SVX_DLLPUBLIC EscherExAtom -{ - sal_uInt32 nContPos; - SvStream& rStrm; - - EscherExAtom( SvStream& rSt, const sal_uInt16 nRecType, const sal_uInt16 nInstance = 0, const sal_uInt8 nVersion = 0 ); - ~EscherExAtom(); -}; - -struct EscherPropertyValueHelper -{ - static sal_Bool GetPropertyValue( - ::com::sun::star::uno::Any& rAny, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, - const String& rPropertyName, - sal_Bool bTestPropertyAvailability = sal_False ); - - static ::com::sun::star::beans::PropertyState GetPropertyState( - const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &, - const String& rPropertyName ); -}; - -// --------------------------------------------------------------------------------------------- - -struct EscherPersistEntry -{ - UINT32 mnID; - UINT32 mnOffset; - EscherPersistEntry( UINT32 nId, UINT32 nOffset ) { mnID = nId; mnOffset = nOffset; }; - -}; - -// --------------------------------------------------------------------------------------------- - -class SvMemoryStream; -class EscherBlibEntry -{ - - friend class EscherGraphicProvider; - friend class EscherEx; - friend class _EscherEx; - - protected: - - UINT32 mnIdentifier[ 4 ]; - UINT32 mnPictureOffset; // offset auf die grafik im PictureStreams - UINT32 mnSize; // size of real graphic - - UINT32 mnRefCount; // !! reference count - UINT32 mnSizeExtra; // !! size of preceding header - - ESCHER_BlibType meBlibType; - - Size maPrefSize; - MapMode maPrefMapMode; - - sal_Bool mbIsEmpty; - sal_Bool mbIsNativeGraphicPossible; - - public: - - EscherBlibEntry( sal_uInt32 nPictureOffset, const GraphicObject& rObj, - const ByteString& rId, const GraphicAttr* pAttr = NULL ); - - ~EscherBlibEntry(); - - void WriteBlibEntry( SvStream& rSt, sal_Bool bWritePictureOffset, sal_uInt32 nResize = 0 ); - sal_Bool IsEmpty() const { return mbIsEmpty; }; - - BOOL operator==( const EscherBlibEntry& ) const; -}; - -// --------------------------------------------------------------------------------------------- - -#define _E_GRAPH_PROV_USE_INSTANCES 1 -#define _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES 2 - -class SVX_DLLPUBLIC EscherGraphicProvider -{ - sal_uInt32 mnFlags; - - EscherBlibEntry** mpBlibEntrys; - sal_uInt32 mnBlibBufSize; - sal_uInt32 mnBlibEntrys; - - protected : - - UINT32 ImplInsertBlib( EscherBlibEntry* p_EscherBlibEntry ); - - public : - - sal_uInt32 GetBlibStoreContainerSize( SvStream* pMergePicStreamBSE = NULL ) const; - void WriteBlibStoreContainer( SvStream& rStrm, SvStream* pMergePicStreamBSE = NULL ); - sal_Bool WriteBlibStoreEntry(SvStream& rStrm, sal_uInt32 nBlipId, - sal_Bool bWritePictureOffset, sal_uInt32 nResize = 0); - sal_uInt32 GetBlibID( SvStream& rPicOutStream, const ByteString& rGraphicId, const Rectangle& rBoundRect, - const com::sun::star::awt::Rectangle* pVisArea = NULL, const GraphicAttr* pGrafikAttr = NULL ); - sal_Bool HasGraphics() const { return mnBlibEntrys != 0; }; - - void SetNewBlipStreamOffset( sal_Int32 nOffset ); - - sal_Bool GetPrefSize( const sal_uInt32 nBlibId, Size& rSize, MapMode& rMapMode ); - - EscherGraphicProvider( sal_uInt32 nFlags = _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES ); - ~EscherGraphicProvider(); - -}; - -class SVX_DLLPUBLIC EscherSolverContainer -{ - List maShapeList; - List maConnectorList; - -public: - - sal_uInt32 GetShapeId( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rShape ) const; - - void AddShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, sal_uInt32 nId ); - void AddConnector( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, - const ::com::sun::star::awt::Point& rA, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > &, - const ::com::sun::star::awt::Point& rB, - ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rConB ); - - void WriteSolver( SvStream& ); - - EscherSolverContainer(){}; - ~EscherSolverContainer(); -}; - -// --------------------------------------------------------------------------------------------- - -#define ESCHER_CREATEPOLYGON_LINE 1 -#define ESCHER_CREATEPOLYGON_POLYLINE 2 -#define ESCHER_CREATEPOLYGON_POLYPOLYGON 4 - -class GraphicAttr; -class SdrObjCustomShape; - -struct EscherPropSortStruct -{ - sal_uInt8* pBuf; - sal_uInt32 nPropSize; - sal_uInt32 nPropValue; - sal_uInt16 nPropId; -}; - -typedef std::vector< EscherPropSortStruct > EscherProperties; - -class SVX_DLLPUBLIC EscherPropertyContainer -{ - EscherGraphicProvider* pGraphicProvider; - SvStream* pPicOutStrm; - Rectangle* pShapeBoundRect; - - EscherPropSortStruct* pSortStruct; - - sal_uInt32 nSortCount; - sal_uInt32 nSortBufSize; - sal_uInt32 nCountCount; - sal_uInt32 nCountSize; - - sal_Bool bHasComplexData; - sal_Bool bSuppressRotation; - - - sal_uInt32 ImplGetColor( const sal_uInt32 rColor, sal_Bool bSwap = sal_True ); - void ImplCreateGraphicAttributes( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, - sal_uInt32 nBlibId, sal_Bool bCreateCroppingAttributes ); - sal_Bool ImplCreateEmbeddedBmp( const ByteString& rUniqueId ); - void ImplInit(); - - public : - - EscherPropertyContainer(); - EscherPropertyContainer( - EscherGraphicProvider& rGraphicProvider, // the PropertyContainer needs to know - SvStream* pPicOutStrm, // the GraphicProvider to be able to write - Rectangle& rShapeBoundRect ); // FillBitmaps or GraphicObjects. - // under some cirumstances the ShapeBoundRect is adjusted - // this will happen when rotated GraphicObjects - // are saved to PowerPoint - ~EscherPropertyContainer(); - - void AddOpt( sal_uInt16 nPropertyID, const rtl::OUString& rString ); - - void AddOpt( sal_uInt16 nPropertyID, sal_uInt32 nPropValue, - sal_Bool bBlib = sal_False ); - - void AddOpt( sal_uInt16 nPropertyID, sal_Bool bBlib, sal_uInt32 nPropValue, - sal_uInt8* pProp, sal_uInt32 nPropSize ); - - sal_Bool GetOpt( sal_uInt16 nPropertyID, sal_uInt32& rPropValue ) const; - - sal_Bool GetOpt( sal_uInt16 nPropertyID, EscherPropSortStruct& rPropValue ) const; - - EscherProperties GetOpts() const; - - void Commit( SvStream& rSt, sal_uInt16 nVersion = 3, sal_uInt16 nRecType = ESCHER_OPT ); - - sal_Bool CreateOLEGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXOleObject ); - - /** Creates a complex ESCHER_Prop_fillBlip containing the BLIP directly (for Excel charts). */ - sal_Bool CreateEmbeddedBitmapProperties( const ::rtl::OUString& rBitmapUrl, - ::com::sun::star::drawing::BitmapMode eBitmapMode ); - /** Creates a complex ESCHER_Prop_fillBlip containing a hatch style (for Excel charts). */ - sal_Bool CreateEmbeddedHatchProperties( const ::com::sun::star::drawing::Hatch& rHatch, - const Color& rBackColor, bool bFillBackground ); - - // the GraphicProperties will only be created if a GraphicProvider and PicOutStrm is known - // DR: #99897# if no GraphicProvider is present, a complex ESCHER_Prop_fillBlip - // will be created, containing the BLIP directly (e.g. for Excel charts). - sal_Bool CreateGraphicProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, - const String& rSource, const sal_Bool bCreateFillBitmap, const sal_Bool bCreateCroppingAttributes = sal_False, - const sal_Bool bFillBitmapModeAllowed = sal_True ); - - sal_Bool CreatePolygonProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, - sal_uInt32 nFlags, sal_Bool bBezier, ::com::sun::star::awt::Rectangle& rGeoRect, Polygon* pPolygon = NULL ); - - static sal_uInt32 GetGradientColor( const ::com::sun::star::awt::Gradient* pGradient, sal_uInt32 nStartColor ); - - void CreateGradientProperties( const ::com::sun::star::awt::Gradient & rGradient ); - void CreateGradientProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & ); - void CreateLineProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, sal_Bool bEdge ); - void CreateFillProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, sal_Bool bEdge ); - void CreateTextProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > &, sal_uInt32 nText, - const sal_Bool bIsCustomShape = sal_False, const sal_Bool bIsTextFrame = sal_True ); - - sal_Bool CreateConnectorProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, - EscherSolverContainer& rSolver, ::com::sun::star::awt::Rectangle& rGeoRect, - sal_uInt16& rShapeType, sal_uInt16& rShapeFlags ); - - // 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. - sal_Bool CreateShadowProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & ); - - // creates all necessary CustomShape properties, this includes also Text-, Shadow-, Fill-, and LineProperties - void CreateCustomShapeProperties( const MSO_SPT eShapeType, const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & ); - sal_Bool IsFontWork() const; - - // helper functions which are also used by the escher import - static PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape ); - static PolyPolygon GetPolyPolygon( const ::com::sun::star::uno::Any& rSource ); - static MSO_SPT GetCustomShapeType( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, sal_uInt32& nMirrorFlags ); - static MSO_SPT GetCustomShapeType( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & rXShape, sal_uInt32& nMirrorFlags, rtl::OUString& rShapeType ); - - // helper functions which are also used in ooxml export - static sal_Bool GetLineArrow( const sal_Bool bLineStart, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, - ESCHER_LineEnd& reLineEnd, sal_Int32& rnArrowLength, sal_Int32& rnArrowWidth ); - static sal_Bool IsDefaultObject( SdrObjCustomShape* pCustoShape ); - static void LookForPolarHandles( const MSO_SPT eShapeType, sal_Int32& nAdjustmentsWhichNeedsToBeConverted ); - static sal_Bool GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue ); -}; - -// --------------------------------------------------------------------------------------------- - -class SVX_DLLPUBLIC EscherPersistTable -{ - - public: - List maPersistTable; - - BOOL PtIsID( UINT32 nID ); - void PtInsert( UINT32 nID, UINT32 nOfs ); - UINT32 PtDelete( UINT32 nID ); - UINT32 PtGetOffsetByID( UINT32 nID ); - UINT32 PtReplace( UINT32 nID, UINT32 nOfs ); - UINT32 PtReplaceOrInsert( UINT32 nID, UINT32 nOfs ); - UINT32 PtGetCount() const { return maPersistTable.Count(); }; - - EscherPersistTable(); - virtual ~EscherPersistTable(); -}; - -// --------------------------------------------------------------------------------------------- - -class EscherEx; - -/// abstract base class for ESCHER_ClientTextbox, ESCHER_ClientData -class SVX_DLLPUBLIC EscherExClientRecord_Base -{ -public: - EscherExClientRecord_Base() {} - virtual ~EscherExClientRecord_Base(); - - /// Application writes the record header - /// using rEx.AddAtom(...) followed by - /// record data written to rEx.GetStream() - virtual void WriteData( EscherEx& rEx ) const = 0; -}; - - -/// abstract base class for ESCHER_ClientAnchor -class SVX_DLLPUBLIC EscherExClientAnchor_Base -{ -public: - EscherExClientAnchor_Base() {} - virtual ~EscherExClientAnchor_Base(); - - /// Application writes the record header - /// using rEx.AddAtom(...) followed by - /// record data written to rEx.GetStream() - virtual void WriteData( EscherEx& rEx, - const Rectangle& rRect ) = 0; -}; - - -class EscherExHostAppData -{ -private: - EscherExClientAnchor_Base* pClientAnchor; - EscherExClientRecord_Base* pClientData; - EscherExClientRecord_Base* pClientTextbox; - // ignore single shape if entire pages are written - BOOL bDontWriteShape; - -public: - EscherExHostAppData() : pClientAnchor(0), pClientData(0), - pClientTextbox(0), bDontWriteShape(FALSE) - {} - - void SetClientAnchor( EscherExClientAnchor_Base* p ) - { pClientAnchor = p; } - void SetClientData( EscherExClientRecord_Base* p ) - { pClientData = p; } - void SetClientTextbox( EscherExClientRecord_Base* p ) - { pClientTextbox = p; } - void SetDontWriteShape( BOOL b ) - { bDontWriteShape = b; } - EscherExClientAnchor_Base* GetClientAnchor() const - { return pClientAnchor; } - EscherExClientRecord_Base* GetClientData() const - { return pClientData; } - EscherExClientRecord_Base* GetClientTextbox() const - { return pClientTextbox; } - - void WriteClientAnchor( EscherEx& rEx, const Rectangle& rRect ) - { if( pClientAnchor ) pClientAnchor->WriteData( rEx, rRect ); } - void WriteClientData( EscherEx& rEx ) - { if( pClientData ) pClientData->WriteData( rEx ); } - void WriteClientTextbox( EscherEx& rEx ) - { if( pClientTextbox ) pClientTextbox->WriteData( rEx ); } - - BOOL DontWriteShape() const { return bDontWriteShape; } -}; - - -// --------------------------------------------------------------------------------------------- - -class SdrObject; -class SdrPage; -class ImplEscherExSdr; -class Color; - -class Graphic; -class SvMemoryStream; -class SvStream; - -class SVX_DLLPUBLIC EscherEx : public EscherPersistTable, public EscherGraphicProvider -{ - protected : - - SvStream* mpOutStrm; - ImplEscherExSdr* mpImplEscherExSdr; - UINT32 mnStrmStartOfs; - std::vector< sal_uInt32 > mOffsets; - std::vector< sal_uInt16 > mRecTypes; - - UINT32 mnDrawings; - UINT32 mnFIDCLs; // anzahl der cluster ID's - - UINT32 mnCurrentDg; - UINT32 mnCurrentShapeID; // die naechste freie ID - UINT32 mnCurrentShapeMaximumID; // die hoechste und auch benutzte ID - UINT32 mnTotalShapesDg; // anzahl der shapes im Dg - UINT32 mnTotalShapeIdUsedDg; // anzahl der benutzten shape Id's im Dg - UINT32 mnTotalShapesDgg; // anzahl der shapes im Dgg - UINT32 mnCountOfs; - - UINT32 mnGroupLevel; - UINT16 mnHellLayerId; - - BOOL mbEscherSpgr; - BOOL mbEscherDgg; - BOOL mbEscherDg; - BOOL mbOleEmf; // OLE is EMF instead of WMF - - - virtual BOOL DoSeek( UINT32 nKey ); - - public: - - EscherEx( SvStream& rOut, UINT32 nDrawings ); - - /// Fuegt in den EscherStream interne Daten ein, dieser Vorgang - /// darf und muss nur einmal ausgefuehrt werden. - /// Wenn pPicStreamMergeBSE angegeben ist, werden die BLIPs - /// aus diesem Stream in die MsofbtBSE Records des EscherStream - /// gemerged, wie es fuer Excel (und Word?) benoetigt wird. - virtual void Flush( SvStream* pPicStreamMergeBSE = NULL ); - - virtual ~EscherEx(); - - // Application may overload this function to maintain an offset - // table for specific regions but MUST call this function too. - virtual void InsertAtCurrentPos( UINT32 nBytes, BOOL bCont = FALSE );// es werden nBytes an der aktuellen Stream Position eingefuegt, - // die PersistantTable und interne Zeiger angepasst - - void InsertPersistOffset( UINT32 nKey, UINT32 nOffset ); // Es wird nicht geprueft, ob sich jener schluessel schon in der PersistantTable befindet - BOOL SeekToPersistOffset( UINT32 nKey ); - virtual BOOL InsertAtPersistOffset( UINT32 nKey, UINT32 nValue );// nValue wird im Stream an entrsprechender Stelle eingefuegt(overwrite modus), ohne dass sich die - // aktuelle StreamPosition aendert - - SvStream& GetStream() const { return *mpOutStrm; } - ULONG GetStreamPos() const { return mpOutStrm->Tell(); } - - virtual BOOL SeekBehindRecHeader( UINT16 nRecType ); // der stream muss vor einem gueltigen Record Header oder Atom stehen - - // features beim erzeugen folgender Container: - // - // ESCHER_DggContainer: ein EscherDgg Atom wird automatisch erzeugt und verwaltet - // ESCHER_DgContainer: ein EscherDg Atom wird automatisch erzeugt und verwaltet - // ESCHER_SpgrContainer: - // ESCHER_SpContainer: - - virtual void OpenContainer( UINT16 nEscherContainer, int nRecInstance = 0 ); - virtual void CloseContainer(); - - virtual void BeginAtom(); - virtual void EndAtom( UINT16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); - virtual void AddAtom( UINT32 nAtomSitze, UINT16 nRecType, int nRecVersion = 0, int nRecInstance = 0 ); - virtual void AddChildAnchor( const Rectangle& rRectangle ); - virtual void AddClientAnchor( const Rectangle& rRectangle ); - - virtual UINT32 EnterGroup( const String& rShapeName, const Rectangle* pBoundRect = 0 ); - UINT32 EnterGroup( const Rectangle* pBoundRect = NULL ); - UINT32 GetGroupLevel() const { return mnGroupLevel; }; - virtual BOOL SetGroupSnapRect( UINT32 nGroupLevel, const Rectangle& rRect ); - virtual BOOL SetGroupLogicRect( UINT32 nGroupLevel, const Rectangle& rRect ); - virtual void LeaveGroup(); - - // ein ESCHER_Sp wird geschrieben ( Ein ESCHER_DgContainer muss dazu geoeffnet sein !!) - virtual void AddShape( UINT32 nShpInstance, UINT32 nFlagIds, UINT32 nShapeID = 0 ); - // reserviert eine ShapeId - UINT32 GetShapeID(); - - virtual void Commit( EscherPropertyContainer& rProps, const Rectangle& rRect ); - - UINT32 GetColor( const UINT32 nColor, BOOL bSwap = TRUE ); - UINT32 GetColor( const Color& rColor, BOOL bSwap = TRUE ); - - // OLE is written as EMF instead of WMF (default WMF) - void SetOleEmf( BOOL bVal ) { mbOleEmf = bVal; } - BOOL IsOleEmf() const { return mbOleEmf; } - - // ...Sdr... implemented in eschesdo.cxx - - void AddSdrPage( const SdrPage& rPage ); - - /// returns the ShapeID - UINT32 AddSdrObject( const SdrObject& rObj ); - - /// If objects are written through AddSdrObject the - /// SolverContainer has to be written, and maybe some - /// maintenance to be done. - void EndSdrObjectPage(); - - /// Called before a shape is written, application supplies - /// ClientRecords. May set AppData::bDontWriteShape so the - /// shape is ignored. - virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rShape ); - - /// Called after a shape is written to inform the application - /// of the resulted shape type and ID. - virtual void EndShape( UINT16 nShapeType, UINT32 nShapeID ); - - /// Called before an AdditionalText EnterGroup occurs. - /// The current shape will be written in three parts: - /// a group shape, the shape itself, and an extra textbox shape. - /// The complete flow is: - /// StartShape sets HostData1. - /// EnterAdditionalTextGroup sets HostData2, App may modify - /// HostData1 and keep track of the change. - /// The group shape is written with HostData2. - /// Another StartShape with the same (!) object sets HostData3. - /// The current shape is written with HostData3. - /// EndShape is called for the current shape. - /// Another StartShape with the same (!) object sets HostData4. - /// The textbox shape is written with HostData4. - /// EndShape is called for the textbox shape. - /// EndShape is called for the group shape, this provides - /// the same functionality as an ordinary recursive group. - virtual EscherExHostAppData* EnterAdditionalTextGroup(); - - /// Called if a picture shall be written and no PicStream is - /// set at ImplEscherExSdr - virtual SvStream* QueryPicStream(); - - /// Called if an ESCHER_Prop_lTxid shall be written - virtual UINT32 QueryTextID( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >&, UINT32 nShapeId ); - // add an dummy rectangle shape into the escher stream - UINT32 AddDummyShape(); - - static const SdrObject* GetSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& rXShape ); - - void SetHellLayerId( UINT16 nId ) { mnHellLayerId = nId; } - UINT16 GetHellLayerId() const { return mnHellLayerId; } -}; - - -#endif // _SVX_ESCHEREX_HXX diff --git a/svx/inc/svx/escpitem.hxx b/svx/inc/svx/escpitem.hxx index ed18f2bfab..a75e157ef3 100644 --- a/svx/inc/svx/escpitem.hxx +++ b/svx/inc/svx/escpitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc new file mode 100644 index 0000000000..fbbea43260 --- /dev/null +++ b/svx/inc/svx/exthelpid.hrc @@ -0,0 +1,58 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: helpid.hrc,v $ + * $Revision: 1.78 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_EXTHELPID_HRC +#define _SVX_EXTHELPID_HRC +// include --------------------------------------------------------------- + +#include <svl/solar.hrc> + +// these HIDs are used in SVX and also in other modules, mainly CUI +// the reason is that different controls have the same help texts assigned +// but are implemented in different libraries +// to avoid "exporting" the whole HID list only those few ones that are shared +// are moved to this exported (delivered) hrc file + +// Help-Ids -------------------------------------------------------------- +#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0) +#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1)
+ +// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here! + +// ----------------------------------------------------------------------- +// Overrun check --------------------------------------------------------- +// ----------------------------------------------------------------------- + +#define ACT_SVX_EXT_HID_END (HID_SVX_EXT0_START + 1) +#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END +#error Resource-Ueberlauf in #line, #file +#endif + +#endif + diff --git a/svx/inc/svx/fhgtitem.hxx b/svx/inc/svx/fhgtitem.hxx index 3dd2489b30..cc98e695ce 100644 --- a/svx/inc/svx/fhgtitem.hxx +++ b/svx/inc/svx/fhgtitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/fillctrl.hxx b/svx/inc/svx/fillctrl.hxx index e36b6b3502..61a1cbe353 100644 --- a/svx/inc/svx/fillctrl.hxx +++ b/svx/inc/svx/fillctrl.hxx @@ -31,7 +31,7 @@ #ifndef _FILLCTRL_HXX #define _FILLCTRL_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/tbxctrl.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/flditem.hxx b/svx/inc/svx/flditem.hxx index 0957d8554f..4e1f301aea 100644 --- a/svx/inc/svx/flditem.hxx +++ b/svx/inc/svx/flditem.hxx @@ -33,7 +33,7 @@ #include <i18npool/lang.h> #include <tools/time.hxx> #include <tools/date.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/pstm.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/fmsearch.hxx b/svx/inc/svx/fmsearch.hxx index 8eccd5be30..a24b5a5cab 100644 --- a/svx/inc/svx/fmsearch.hxx +++ b/svx/inc/svx/fmsearch.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #define _SVSTDARR_STRINGSDTOR -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #ifndef _DIALOG_HXX //autogen #include <vcl/dialog.hxx> diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx new file mode 100644 index 0000000000..3f839d70bf --- /dev/null +++ b/svx/inc/svx/fmtools.hxx @@ -0,0 +1,383 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: fmtools.hxx,v $ + * $Revision: 1.27 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_FMTOOLS_HXX +#define _SVX_FMTOOLS_HXX + +#include <com/sun/star/sdb/SQLContext.hpp> +#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> +#include <com/sun/star/sdbcx/Privilege.hpp> +#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> +#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> +#include <com/sun/star/sdbc/XRowSet.hpp> +#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> +#include <com/sun/star/sdb/XColumn.hpp> +#include <com/sun/star/sdb/XColumnUpdate.hpp> +#include <com/sun/star/sdb/SQLErrorEvent.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> +#include <com/sun/star/sdbc/XResultSet.hpp> +#include <com/sun/star/sdbc/XResultSetUpdate.hpp> +#include <com/sun/star/sdbcx/XRowLocate.hpp> +#include <com/sun/star/sdbc/XDataSource.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/frame/XDispatchProviderInterception.hpp> +#include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> +#include <com/sun/star/frame/XInterceptorInfo.hpp> +#include <com/sun/star/container/XIndexContainer.hpp> +#include <com/sun/star/frame/XDispatch.hpp> +#include <com/sun/star/frame/XStatusListener.hpp> +#include <com/sun/star/frame/FeatureStateEvent.hpp> +#include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/script/ScriptEventDescriptor.hpp> +#include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/container/XEnumeration.hpp> +#include <com/sun/star/container/XIndexAccess.hpp> +#include <com/sun/star/awt/XControlModel.hpp> +#include <com/sun/star/awt/XControl.hpp> +#include <com/sun/star/awt/FontSlant.hpp> +#include <com/sun/star/awt/FontDescriptor.hpp> +#include <com/sun/star/awt/FontUnderline.hpp> +#include <com/sun/star/awt/FontStrikeout.hpp> +#include <com/sun/star/util/XNumberFormatsSupplier.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <vcl/wintypes.hxx> +#include <vos/mutex.hxx> + +#ifndef _SVSTDARR_ULONGS +#define _SVSTDARR_ULONGS +#include <svl/svstdarr.hxx> +#endif +#include <sfx2/ctrlitem.hxx> +#include <tools/link.hxx> +#include <tools/date.hxx> +#include <tools/time.hxx> +#include <tools/datetime.hxx> + +//#include "fmprop.hrc" +#include <com/sun/star/sdbc/XConnection.hpp> +#include <com/sun/star/io/XObjectInputStream.hpp> +#include <com/sun/star/io/XObjectOutputStream.hpp> +#include <com/sun/star/io/XPersistObject.hpp> +#include <com/sun/star/util/XNumberFormatter.hpp> +#include <com/sun/star/util/XNumberFormats.hpp> +#include <cppuhelper/interfacecontainer.h> +#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase3.hxx> +#include <cppuhelper/weakref.hxx> +#include <comphelper/uno3.hxx> +#include <comphelper/stl_types.hxx> +#include <cppuhelper/implbase1.hxx> +#include <cppuhelper/implbase2.hxx> +#include <cppuhelper/implbase3.hxx> +#include <cppuhelper/component.hxx> + +#include <svx/svxdllapi.h> + +#include <set> + +class Window; + +//================================================================== +// allgemeine Typen +//================================================================== +// displaying a database exception for the user +// display info about a simple ::com::sun::star::sdbc::SQLException +void displayException(const ::com::sun::star::sdbc::SQLException&, Window* _pParent = NULL); +void displayException(const ::com::sun::star::sdbc::SQLWarning&, Window* _pParent = NULL); +SVX_DLLPUBLIC void displayException(const ::com::sun::star::sdb::SQLContext&, Window* _pParent = NULL); +void displayException(const ::com::sun::star::sdb::SQLErrorEvent&, Window* _pParent = NULL); +void displayException(const ::com::sun::star::uno::Any&, Window* _pParent = NULL); + +#define DATA_MODE rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DataMode" ) ) +#define FILTER_MODE rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterMode" ) ) + +// Kopieren von Persistenten Objecten +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> cloneUsingProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::io::XPersistObject>& _xObj); + +sal_Int32 findPos(const ::rtl::OUString& aStr, const ::com::sun::star::uno::Sequence< ::rtl::OUString>& rList); + +// Suchen in einer Indexliste nach einem Element +sal_Bool searchElement(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& xCont, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElement); + +sal_Int32 getElementPos(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& xCont, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xElement); +String getFormComponentAccessPath(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xElement); +String getFormComponentAccessPath(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _xElement, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rTopLevelElement); +::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> getElementFromAccessPath(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& _xParent, const String& _rRelativePath); + + +::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel> getXModel(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xIface); + +SVX_DLLPUBLIC ::rtl::OUString getLabelName(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& xControlModel); + +// =================================================================================================== +// = class CursorWrapper - eine Hilfsklasse, die parallel mit je einem ::com::sun::star::uno::Reference<XDatabaseUpdateCursor>, +// XDatabaseBookmarkCursor und XDatabaseDirectCursor arbeitet +// =================================================================================================== + +class CursorWrapper +{ +private: + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xGeneric; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> m_xMoveOperations; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate> m_xBookmarkOperations; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> m_xColumnsSupplier; + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> m_xPropertyAccess; + +public: + // Construction/Destruction + CursorWrapper() { } + CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxCursor, sal_Bool bUseCloned = sal_False); + SVX_DLLPUBLIC CursorWrapper(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned = sal_False); + // bei bUseCloned == sal_True wird der Cursor ueber das XCloneable-Interface (dass er besitzen muss) gedoubled und + // erst dann benutzt + + friend bool operator==(const CursorWrapper& lhs, const CursorWrapper& rhs) + { + return lhs.m_xGeneric.get() == rhs.m_xGeneric.get(); + } + + sal_Bool is() const { return m_xMoveOperations.is(); } + sal_Bool Is() const { return m_xMoveOperations.is(); } + + CursorWrapper* operator ->() { return this; } + operator const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& () const{ return m_xGeneric; } + + // 'Konvertierungen' + const CursorWrapper& operator=(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& xCursor); + operator const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& () const { return m_xMoveOperations; } + operator const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate>& () const { return m_xBookmarkOperations; } + operator const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>& () const { return m_xColumnsSupplier; } + + const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& getPropertySet() const { return m_xPropertyAccess; } + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& getResultSet() const { return m_xMoveOperations; } + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate >& getRowLocate() const { return m_xBookmarkOperations; } + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& getColumnsSupplier() const { return m_xColumnsSupplier; } + + // das normale queryInterface + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ) + { return m_xMoveOperations->queryInterface(type); } + + // ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XRowLocate> + ::com::sun::star::uno::Any getBookmark(void) + throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) + { return m_xBookmarkOperations->getBookmark(); } + sal_Bool moveToBookmark(const ::com::sun::star::uno::Any& bookmark) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) { return m_xBookmarkOperations->moveToBookmark(bookmark); } + sal_Bool moveRelativeToBookmark(const ::com::sun::star::uno::Any& bookmark, sal_Int32 rows) throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) { return m_xBookmarkOperations->moveRelativeToBookmark(bookmark, rows); } + sal_Int32 compareBookmarks(const ::com::sun::star::uno::Any& lhs, const ::com::sun::star::uno::Any& rhs) const throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) { return m_xBookmarkOperations->compareBookmarks(lhs, rhs); } + sal_Int32 hasOrderedBookmarks(void) const throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) { return m_xBookmarkOperations->hasOrderedBookmarks(); } + sal_Int32 hashBookmark(const ::com::sun::star::uno::Any& bookmark) const throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) { return m_xBookmarkOperations->hashBookmark(bookmark); } + + // ::com::sun::star::sdbc::XResultSet + sal_Bool isBeforeFirst() const { return m_xMoveOperations->isBeforeFirst(); } + sal_Bool isAfterLast() const { return m_xMoveOperations->isAfterLast(); } + sal_Bool isFirst() const { return m_xMoveOperations->isFirst(); } + sal_Bool isLast() const { return m_xMoveOperations->isLast(); } + void beforeFirst() { m_xMoveOperations->beforeFirst(); } + sal_Bool first() { return m_xMoveOperations->first(); } + sal_Bool last() { return m_xMoveOperations->last(); } + sal_Int32 getRow() const { return m_xMoveOperations->getRow(); } + sal_Bool absolute(sal_Int32 nPosition) { return m_xMoveOperations->absolute(nPosition); } + sal_Bool relative(sal_Int32 nCount) { return m_xMoveOperations->relative(nCount); } + sal_Bool previous() { return m_xMoveOperations->previous(); } + sal_Bool next() { return m_xMoveOperations->next(); } + void refreshRow() { m_xMoveOperations->refreshRow(); } + sal_Bool rowUpdated() { return m_xMoveOperations->rowUpdated(); } + sal_Bool rowInserted() { return m_xMoveOperations->rowInserted(); } + sal_Bool rowDeleted() { return m_xMoveOperations->rowDeleted(); } + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> getStatement() { return m_xMoveOperations->getStatement(); } + // ::com::sun::star::sdbcx::XColumnsSupplier + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess> getColumns() const throw( ::com::sun::star::uno::RuntimeException ) { return m_xColumnsSupplier->getColumns(); } +private: + void ImplConstruct(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet>& _rxCursor, sal_Bool bUseCloned); +}; + + +class FmXDisposeMultiplexer; +class FmXDisposeListener +{ + friend class FmXDisposeMultiplexer; + + FmXDisposeMultiplexer* m_pAdapter; + ::osl::Mutex& m_rMutex; + +public: + FmXDisposeListener(::osl::Mutex& _rMutex) : m_pAdapter(NULL), m_rMutex(_rMutex) { } + virtual ~FmXDisposeListener(); + + virtual void disposing(const ::com::sun::star::lang::EventObject& _rEvent, sal_Int16 _nId) throw( ::com::sun::star::uno::RuntimeException ) = 0; + +protected: + void setAdapter(FmXDisposeMultiplexer* pAdapter); +}; + +typedef ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener> FmXDisposeMultiplexer_x; +//============================================================================== + + +class FmXDisposeMultiplexer :public ::cppu::WeakImplHelper1< ::com::sun::star::lang::XEventListener> +{ + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> m_xObject; + FmXDisposeListener* m_pListener; + sal_Int16 m_nId; + + virtual ~FmXDisposeMultiplexer(); +public: + FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent>& _rxObject, sal_Int16 _nId = -1); + +// ::com::sun::star::lang::XEventListener + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + + void dispose(); +}; + +// ================================================================== + +//======================================================================== +//= dispatch interception helper classes +//======================================================================== + +//------------------------------------------------------------------------ +//- FmDispatchInterceptor +//------------------------------------------------------------------------ +class FmDispatchInterceptor +{ +public: + FmDispatchInterceptor() { } + + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch> interceptedQueryDispatch(sal_uInt16 _nId, + const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags) throw( ::com::sun::star::uno::RuntimeException ) = 0; + + virtual ::osl::Mutex* getInterceptorMutex() = 0; +}; + +//------------------------------------------------------------------------ +//- FmXDispatchInterceptorImpl +//------------------------------------------------------------------------ +typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::frame::XDispatchProviderInterceptor + , ::com::sun::star::lang::XEventListener + , ::com::sun::star::frame::XInterceptorInfo + > FmXDispatchInterceptorImpl_BASE; + +class FmXDispatchInterceptorImpl : public FmXDispatchInterceptorImpl_BASE +{ + ::osl::Mutex m_aFallback; + + // the component which's dispatches we're intercepting + ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XDispatchProviderInterception> + m_xIntercepted; + sal_Bool m_bListening; + + // the real interceptor + FmDispatchInterceptor* m_pMaster; + + // chaining + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xSlaveDispatcher; + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider> m_xMasterDispatcher; + + // our id + sal_Int16 m_nId; + + ::com::sun::star::uno::Sequence< ::rtl::OUString > + m_aInterceptedURLSchemes; + + virtual ~FmXDispatchInterceptorImpl(); + +public: + ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception> getIntercepted() const { return m_xIntercepted; } + +public: + FmXDispatchInterceptorImpl( + const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProviderInterception>& _rToIntercept, + FmDispatchInterceptor* _pMaster, + sal_Int16 _nId, + ::com::sun::star::uno::Sequence< ::rtl::OUString > _rInterceptedSchemes /// if not empty, this will be used for getInterceptedURLs + ); + + // StarOne + DECLARE_UNO3_DEFAULTS(FmXDispatchInterceptorImpl, FmXDispatchInterceptorImpl_BASE); + // virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& type) throw ( ::com::sun::star::uno::RuntimeException ); + virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException); + // ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); + + + // ::com::sun::star::frame::XDispatchProvider + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL queryDispatch( const ::com::sun::star::util::URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(::com::sun::star::uno::RuntimeException); + 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); + + // ::com::sun::star::frame::XDispatchProviderInterceptor + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getSlaveDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setSlaveDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewDispatchProvider ) throw(::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > SAL_CALL getMasterDispatchProvider( ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setMasterDispatchProvider( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xNewSupplier ) throw(::com::sun::star::uno::RuntimeException); + + // ::com::sun::star::frame::XInterceptorInfo + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getInterceptedURLs( ) throw(::com::sun::star::uno::RuntimeException); + + // ::com::sun::star::lang::XEventListener + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); + + // OComponentHelper + virtual void SAL_CALL disposing(); + +protected: + void ImplDetach(); + + ::osl::Mutex& getAccessSafety() + { + if (m_pMaster && m_pMaster->getInterceptorMutex()) + return *m_pMaster->getInterceptorMutex(); + return m_aFallback; + } +}; + +//================================================================== +// ... +//================================================================== +::rtl::OUString getServiceNameByControlType(sal_Int16 nType); + // get a service name to create a model of the given type (OBJ_FM_...) +sal_Int16 getControlTypeByObject(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo>& _rxObject); + // get the object type (OBJ_FM_...) from the services the object supports + +void TransferEventScripts(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel>& xModel, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl>& xControl, + const ::com::sun::star::uno::Sequence< ::com::sun::star::script::ScriptEventDescriptor>& rTransferIfAvailable); + +sal_Int16 GridView2ModelPos(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess>& rColumns, sal_Int16 nViewPos); + +//================================================================== +sal_Bool isLoadable(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& xLoad); +sal_Bool isRowSetAlive(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxRowSet); + // checks if the ::com::sun::star::sdbcx::XColumnsSupplier provided by _rxRowSet supllies any columns + +//================================================================== +typedef ::std::set < ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > + , ::comphelper::OInterfaceCompare< ::com::sun::star::uno::XInterface > + > InterfaceBag; + +#endif // _SVX_FMTOOLS_HXX + diff --git a/svx/inc/svx/fntctl.hxx b/svx/inc/svx/fntctl.hxx index 03435c4e96..b88ba95bf8 100644 --- a/svx/inc/svx/fntctl.hxx +++ b/svx/inc/svx/fntctl.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <sfx2/mnuitem.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/forbiddenruleitem.hxx b/svx/inc/svx/forbiddenruleitem.hxx index 9cb082031a..e50298f551 100644 --- a/svx/inc/svx/forbiddenruleitem.hxx +++ b/svx/inc/svx/forbiddenruleitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/frmdiritem.hxx b/svx/inc/svx/frmdiritem.hxx index 3e68978b1b..70df9f75d5 100644 --- a/svx/inc/svx/frmdiritem.hxx +++ b/svx/inc/svx/frmdiritem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/frmdir.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/gallery1.hxx b/svx/inc/svx/gallery1.hxx new file mode 100644 index 0000000000..fc47bfca35 --- /dev/null +++ b/svx/inc/svx/gallery1.hxx @@ -0,0 +1,186 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: gallery1.hxx,v $ + * $Revision: 1.8.216.1 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVX_GALLERY1_HXX_ +#define _SVX_GALLERY1_HXX_ + +#include <tools/string.hxx> +#include <tools/list.hxx> +#include <tools/urlobj.hxx> +#include <svl/brdcst.hxx> +#include "svx/svxdllapi.h" +//#include "gallery.hrc" + +#include <cstdio> +#include <list> + +// --------------------- +// - GalleryThemeEntry - +// --------------------- + +class SvStream; + +class GalleryThemeEntry +{ +private: + + String aName; + INetURLObject aThmURL; + INetURLObject aSdgURL; + INetURLObject aSdvURL; + UINT32 nFileNumber; + UINT32 nId; + BOOL bReadOnly; + BOOL bImported; + BOOL bModified; + BOOL bThemeNameFromResource; + + GalleryThemeEntry(); + INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL ) const; + +public: + + GalleryThemeEntry( const INetURLObject& rBaseURL, const String& rName, + UINT32 nFileNumber, BOOL bReadOnly, BOOL bImported, + BOOL bNewFile, UINT32 nId, BOOL bThemeNameFromResource ); + ~GalleryThemeEntry() {}; + + const String& GetThemeName() const { return aName; } + UINT32 GetFileNumber() const { return nFileNumber; } + + const INetURLObject& GetThmURL() const { return aThmURL; } + const INetURLObject& GetSdgURL() const { return aSdgURL; } + const INetURLObject& GetSdvURL() const { return aSdvURL; } + + BOOL IsImported() const { return bImported; } + BOOL IsReadOnly() const { return bReadOnly; } + BOOL IsDefault() const; + + BOOL IsHidden() const { return aName.SearchAscii( "private://gallery/hidden/" ) == 0; } + + BOOL IsModified() const { return bModified; } + void SetModified( BOOL bSet ) { bModified = ( bSet && !IsImported() && !IsReadOnly() ); } + + void SetName( const String& rNewName ); + BOOL IsNameFromResource() const { return bThemeNameFromResource; } + + UINT32 GetId() const { return nId; } + void SetId( UINT32 nNewId, BOOL bResetThemeName ); +}; + +DECLARE_LIST( GalleryThemeList, GalleryThemeEntry* ) + +// --------------------------- +// - GalleryImportThemeEntry - +// --------------------------- + +struct GalleryImportThemeEntry +{ + String aThemeName; + String aUIName; + INetURLObject aURL; + String aImportName; +}; +DECLARE_LIST( GalleryImportThemeList, GalleryImportThemeEntry* ) + +// ----------------------------------------------------------------------------- + +SvStream& operator<<( SvStream& rOut, const GalleryImportThemeEntry& rEntry ); +SvStream& operator>>( SvStream& rIn, GalleryImportThemeEntry& rEntry ); + +// ----------- +// - Gallery - +// ----------- + +class SfxListener; +class GalleryTheme; + +class Gallery : public SfxBroadcaster +{ + // only for gengal utility! + friend Gallery* createGallery( const rtl::OUString& ); + friend void disposeGallery( Gallery* ); + +private: + + GalleryThemeList aThemeList; + GalleryImportThemeList aImportList; + List aThemeCache; + INetURLObject aRelURL; + INetURLObject aUserURL; + rtl_TextEncoding nReadTextEncoding; + ULONG nLastFileNumber; + BOOL bMultiPath; + + void ImplLoad( const String& rMultiPath ); + void ImplLoadSubDirs( const INetURLObject& rBaseURL, sal_Bool& rbIsReadOnly ); + void ImplLoadImports(); + void ImplWriteImportList(); + + SVX_DLLPUBLIC GalleryThemeEntry* ImplGetThemeEntry( const String& rThemeName ); + GalleryThemeEntry* ImplGetThemeEntry( ULONG nThemeId ); + GalleryImportThemeEntry* ImplGetImportThemeEntry( const String& rImportName ); + + GalleryTheme* ImplGetCachedTheme( const GalleryThemeEntry* pThemeEntry ); + void ImplDeleteCachedTheme( GalleryTheme* pTheme ); + + SVX_DLLPUBLIC Gallery( const String& rMultiPath ); + SVX_DLLPUBLIC ~Gallery(); + +public: + + SVX_DLLPUBLIC static Gallery* GetGalleryInstance(); + + ULONG GetThemeCount() const { return aThemeList.Count(); } + const GalleryThemeEntry* GetThemeInfo( ULONG nPos ) { return aThemeList.GetObject( nPos ); } + const GalleryThemeEntry* GetThemeInfo( const String& rThemeName ) { return ImplGetThemeEntry( rThemeName ); } + + SVX_DLLPUBLIC BOOL HasTheme( const String& rThemeName ); + String GetThemeName( ULONG nThemeId ) const; + + SVX_DLLPUBLIC BOOL CreateTheme( const String& rThemeName, UINT32 nNumFrom = 0 ); + BOOL CreateImportTheme( const INetURLObject& rURL, const String& rFileName ); + BOOL RenameTheme( const String& rOldName, const String& rNewName ); + SVX_DLLPUBLIC BOOL RemoveTheme( const String& rThemeName ); + + SVX_DLLPUBLIC GalleryTheme* AcquireTheme( const String& rThemeName, SfxListener& rListener ); + SVX_DLLPUBLIC void ReleaseTheme( GalleryTheme* pTheme, SfxListener& rListener ); + +public: + + INetURLObject GetImportURL( const String& rThemeName ); + + const INetURLObject& GetUserURL() const { return aUserURL; } + const INetURLObject& GetRelativeURL() const { return aRelURL; } + + BOOL IsMultiPath() const { return bMultiPath; } +}; + +#endif // _SVX_GALLERY1_HXX_ diff --git a/svx/inc/svx/galmisc.hxx b/svx/inc/svx/galmisc.hxx new file mode 100644 index 0000000000..e028acee26 --- /dev/null +++ b/svx/inc/svx/galmisc.hxx @@ -0,0 +1,265 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: galmisc.hxx,v $ + * $Revision: 1.19 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVX_GALMISC_HXX_ +#define _SVX_GALMISC_HXX_ + +#include <sot/storage.hxx> +#include <tools/urlobj.hxx> +#include <svtools/imap.hxx> +#include <svl/hint.hxx> +#include <svtools/transfer.hxx> +#include <svx/svdobj.hxx> +#include <com/sun/star/uno/Reference.h> +#include <com/sun/star/awt/XProgressMonitor.hpp> +#include "svx/svxdllapi.h" +#include <tools/date.hxx> +#include <tools/time.hxx> + +// ------------ +// - Forwards - +// ------------ + +class GalleryTheme; + +// ---------------- +// - ExchangeData - +// ---------------- + +struct ExchangeData +{ + GalleryTheme* pTheme; + String aEditedTitle; + Date aThemeChangeDate; + Time aThemeChangeTime; +}; + +enum SgaObjKind +{ + SGA_OBJ_NONE = 0, // Abstraktes Objekt + SGA_OBJ_BMP = 1, // Bitmap-Objekt + SGA_OBJ_SOUND = 2, // Sound-Objekt + SGA_OBJ_VIDEO = 3, // Video-Objekt + SGA_OBJ_ANIM = 4, // Animations-Objekt + SGA_OBJ_SVDRAW = 5, // Svdraw-Objekt + SGA_OBJ_INET = 6 // Grafik aus dem Internet +}; + +// ----------- +// - Defines - +// ----------- + +#define IV_IMAPINFO (UINT32('S')*0x00000001+UINT32('D')*0x00000100+UINT32('U')*0x00010000+UINT32('D')*0x01000000) +#define ID_IMAPINFO 2 + +#define USERDATA_HDL() (LINK(this,SgaUserDataFactory,MakeUserData)) + +#define GAL_RESID( nId ) ResId( nId, *GetGalleryResMgr() ) +#define STREAMBUF_SIZE 16384L + +#define SGA_IMPORT_NONE 0x0000 +#define SGA_IMPORT_FILE 0x0001 +#define SGA_IMPORT_INET 0x0002 + +#define GALLERY_PROGRESS_RANGE 10000 + +#define GALLERY_FG_COLOR Application::GetSettings().GetStyleSettings().GetWindowTextColor() +#define GALLERY_BG_COLOR Application::GetSettings().GetStyleSettings().GetWindowColor() +#define GALLERY_DLG_COLOR Application::GetSettings().GetStyleSettings().GetDialogColor() + +// ------------- +// - Functions - +// ------------- + +class ResMgr; +class String; +class SvStream; +class Graphic; +class FmFormModel; +class ImageMap; +class Gallery; + +SVX_DLLPUBLIC ResMgr* GetGalleryResMgr(); +USHORT GalleryGraphicImport( const INetURLObject& rURL, Graphic& rGraphic, String& rFilterName, BOOL bShowProgress = FALSE ); +BOOL GallerySvDrawImport( SvStream& rIStm, SdrModel& rModel ); +BOOL CreateIMapGraphic( const FmFormModel& rModel, Graphic& rGraphic, ImageMap& rImageMap ); +SVX_DLLPUBLIC String GetReducedString( const INetURLObject& rURL, ULONG nMaxLen ); +String GetSvDrawStreamNameFromURL( const INetURLObject& rSvDrawObjURL ); + +BOOL FileExists( const INetURLObject& rURL ); +BOOL CreateDir( const INetURLObject& rURL ); +BOOL CopyFile( const INetURLObject& rSrcURL, const INetURLObject& rDstURL ); +BOOL KillFile( const INetURLObject& rURL ); +BitmapEx GalleryResGetBitmapEx( sal_uInt32 nId ); + + +// --------------- +// - SgaIMapInfo - +// --------------- + +class SgaIMapInfo : public SdrObjUserData, public SfxListener +{ + ImageMap aImageMap; + +public: + SgaIMapInfo() : SdrObjUserData( IV_IMAPINFO, ID_IMAPINFO, 0 ) {}; + + SgaIMapInfo( const ImageMap& rImageMap) : + SdrObjUserData( IV_IMAPINFO, ID_IMAPINFO, 0 ), + aImageMap( rImageMap ) {}; + + virtual ~SgaIMapInfo() {}; + + virtual SdrObjUserData* Clone( SdrObject* ) const + { + SgaIMapInfo* pInfo = new SgaIMapInfo; + pInfo->aImageMap = aImageMap; + return pInfo; + } + + const ImageMap& GetImageMap() const { return aImageMap; } +}; + +// ---------------------- +// - SgaUserDataFactory - +// ---------------------- + +class SgaUserDataFactory +{ +public: + SgaUserDataFactory() { SdrObjFactory::InsertMakeUserDataHdl( USERDATA_HDL() ); } + ~SgaUserDataFactory() { SdrObjFactory::RemoveMakeUserDataHdl( USERDATA_HDL() ); } + + DECL_LINK( MakeUserData, SdrObjFactory* ); +}; + +// ------------------- +// - GalleryProgress - +// ------------------- + +class GraphicFilter; + +class SVX_DLLPUBLIC GalleryProgress +{ + ::com::sun::star::uno::Reference< ::com::sun::star::awt::XProgressBar > mxProgressBar; + GraphicFilter* mpFilter; + + public: + + GalleryProgress( GraphicFilter* pFilter = NULL ); + ~GalleryProgress(); + + void Update( ULONG nVal, ULONG nMaxVal ); +}; + +// ----------------------- +// - GalleryTransferable - +// ----------------------- + +class Gallery; +class GalleryTheme; +class GraphicObject; + +class GalleryTransferable : public TransferableHelper +{ +friend class GalleryTheme; +using TransferableHelper::CopyToClipboard; + +private: + + GalleryTheme* mpTheme; + SgaObjKind meObjectKind; + sal_uInt32 mnObjectPos; + SotStorageStreamRef mxModelStream; + GraphicObject* mpGraphicObject; + ImageMap* mpImageMap; + INetURLObject* mpURL; + +protected: + + GalleryTransferable( GalleryTheme* pTheme, ULONG nObjectPos, bool bLazy ); + ~GalleryTransferable(); + + void InitData( bool bLazy ); + + // TransferableHelper + virtual void AddSupportedFormats(); + virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual void DragFinished( sal_Int8 nDropAction ); + virtual void ObjectReleased(); + + void CopyToClipboard( Window* pWindow ); + void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, + sal_Int32 nDragPointer = DND_POINTER_NONE, + sal_Int32 nDragImage = DND_IMAGE_NONE ); +}; + +// --------------- +// - GalleryHint - +// --------------- + +#define GALLERY_HINT_NONE 0x00000000 +#define GALLERY_HINT_CLOSE_THEME 0x00000001 +#define GALLERY_HINT_THEME_REMOVED 0x00000002 +#define GALLERY_HINT_THEME_RENAMED 0x00000004 +#define GALLERY_HINT_THEME_CREATED 0x00000008 +#define GALLERY_HINT_THEME_UPDATEVIEW 0x00000010 +#define GALLERY_HINT_CLOSE_OBJECT 0x00000020 +#define GALLERY_HINT_OBJECT_REMOVED 0x00000040 + +// ----------------------------------------------------------------------------- + +class GalleryHint : public SfxHint +{ +private: + + ULONG mnType; + String maThemeName; + String maStringData; + ULONG mnData1; + ULONG mnData2; + +public: + + GalleryHint( ULONG nType, const String& rThemeName, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) : + mnType( nType ), maThemeName( rThemeName ), mnData1( nData1 ), mnData2( nData2 ) {} + + GalleryHint( ULONG nType, const String& rThemeName, const String& rStringData, ULONG nData1 = 0UL, ULONG nData2 = 0UL ) : + mnType( nType ), maThemeName( rThemeName ), maStringData( rStringData ), mnData1( nData1 ), mnData2( nData2 ) {} + + ULONG GetType() const { return mnType; } + const String& GetThemeName() const { return maThemeName; } + const String& GetStringData() const { return maStringData; } + ULONG GetData1() const { return mnData1; } + ULONG GetData2() const { return mnData2; } +}; + + #endif diff --git a/svx/inc/svx/grfcrop.hxx b/svx/inc/svx/grfcrop.hxx index 8a969eb6d3..b717aed3b5 100644 --- a/svx/inc/svx/grfcrop.hxx +++ b/svx/inc/svx/grfcrop.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_GRFCROP_HXX #define _SVX_GRFCROP_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/hngpnctitem.hxx b/svx/inc/svx/hngpnctitem.hxx index cfb0e3a30e..770fafb8a1 100644 --- a/svx/inc/svx/hngpnctitem.hxx +++ b/svx/inc/svx/hngpnctitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/hyznitem.hxx b/svx/inc/svx/hyznitem.hxx index 133f7bd1e3..97fffef06e 100644 --- a/svx/inc/svx/hyznitem.hxx +++ b/svx/inc/svx/hyznitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/impgrf.hxx b/svx/inc/svx/impgrf.hxx new file mode 100644 index 0000000000..b12068e958 --- /dev/null +++ b/svx/inc/svx/impgrf.hxx @@ -0,0 +1,65 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: impgrf.hxx,v $ + * $Revision: 1.7 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _SVX_IMPGRF_HXX +#define _SVX_IMPGRF_HXX + +// include --------------------------------------------------------------- + +#include <svtools/filter.hxx> + +#ifndef _BUTTON_HXX //autogen +#include <vcl/button.hxx> +#endif +#include "svx/svxdllapi.h" + +// Funktionen ------------------------------------------------------------ + +// returnt einen static Graphic-Filter, wird einmalig angelegt, +// steht immer zur Verfuegung, DARF NIE geloescht werden!!!! +SVX_DLLPUBLIC GraphicFilter* GetGrfFilter(); +SVX_DLLPUBLIC int LoadGraphic( const String& rPath, const String& rFilter, + Graphic& rGraphic, + GraphicFilter* pFilter = NULL, + USHORT* pDeterminedFormat = NULL ); + +// class SvxImportGraphicDialog ------------------------------------------ +#ifndef SV_NODIALOG + +#define ENABLE_STANDARD ((USHORT)0x0001) // Standard-Button +#define ENABLE_LINK ((USHORT)0x0002) // Verkn"upfungs-Box +#define ENABLE_STD_AND_LINK (ENABLE_STANDARD | ENABLE_LINK) +#define ENABLE_PROPERTY ((USHORT)0x0004) // Eigenschaften-Button +#define ENABLE_ALL ((USHORT)0x0007) // alle +#define ENABLE_PROP_WITHOUTLINK ((USHORT)0x0008) // Eigenschaften ohne Link +#define ENABLE_EMPTY_FILENAMES ((USHORT)0x0010) // Leere Dateinamen zulassen + +#endif // SV_NODIALOG + +#endif diff --git a/svx/inc/svx/itemtype.hxx b/svx/inc/svx/itemtype.hxx index a17c608759..321e53fdbe 100644 --- a/svx/inc/svx/itemtype.hxx +++ b/svx/inc/svx/itemtype.hxx @@ -41,7 +41,7 @@ #include <tools/resid.hxx> #include <tools/bigint.hxx> #include <svx/dialmgr.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/shl.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/keepitem.hxx b/svx/inc/svx/keepitem.hxx index cd2eb35fb7..19f6b17f9a 100644 --- a/svx/inc/svx/keepitem.hxx +++ b/svx/inc/svx/keepitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/kernitem.hxx b/svx/inc/svx/kernitem.hxx index d909434804..dc4d43c9f0 100644 --- a/svx/inc/svx/kernitem.hxx +++ b/svx/inc/svx/kernitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/langitem.hxx b/svx/inc/svx/langitem.hxx index 87a26e1df1..1513c15e2b 100644 --- a/svx/inc/svx/langitem.hxx +++ b/svx/inc/svx/langitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <i18npool/lang.h> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/lrspitem.hxx b/svx/inc/svx/lrspitem.hxx index 708e59aab9..57ee9cb29c 100644 --- a/svx/inc/svx/lrspitem.hxx +++ b/svx/inc/svx/lrspitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/lspcitem.hxx b/svx/inc/svx/lspcitem.hxx index b99411663d..5723dd113e 100644 --- a/svx/inc/svx/lspcitem.hxx +++ b/svx/inc/svx/lspcitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC diff --git a/svx/inc/svx/msdffdef.hxx b/svx/inc/svx/msdffdef.hxx index 4205b23393..e3f65a5022 100644 --- a/svx/inc/svx/msdffdef.hxx +++ b/svx/inc/svx/msdffdef.hxx @@ -1223,97 +1223,4 @@ BYTE m_bTag; void *m_pvBits; // raster bits of the blip. #endif -class SVX_DLLPUBLIC DffRecordHeader -{ - -public: - BYTE nRecVer; // may be DFF_PSFLAG_CONTAINER - UINT16 nRecInstance; - UINT16 nImpVerInst; - UINT16 nRecType; - UINT32 nRecLen; - ULONG nFilePos; -public: - DffRecordHeader() : nRecVer(0), nRecInstance(0), nImpVerInst(0), nRecType(0), nRecLen(0), nFilePos(0) {} - FASTBOOL IsContainer() const { return nRecVer == DFF_PSFLAG_CONTAINER; } - ULONG GetRecBegFilePos() const { return nFilePos; } - ULONG GetRecEndFilePos() const { return nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen; } - void SeekToEndOfRecord(SvStream& rIn) const { rIn.Seek(nFilePos + DFF_COMMON_RECORD_HEADER_SIZE + nRecLen ); } - void SeekToContent( SvStream& rIn) const { rIn.Seek(nFilePos + DFF_COMMON_RECORD_HEADER_SIZE ); } - void SeekToBegOfRecord(SvStream& rIn) const { rIn.Seek( nFilePos ); } - - SVX_DLLPUBLIC friend SvStream& operator>>(SvStream& rIn, DffRecordHeader& rRec); - -}; - -struct DffPropFlags -{ - BYTE bSet : 1; - BYTE bComplex : 1; - BYTE bBlip : 1; - BYTE bSoftAttr : 1; -}; - -class SvxMSDffManager; - -class SVX_DLLPUBLIC DffPropSet : public Table -{ - protected : - - UINT32 mpContents[ 1024 ]; - DffPropFlags mpFlags[ 1024 ]; - - public : - - DffPropSet( BOOL bInitialize = FALSE ){ if ( bInitialize ) - memset( mpFlags, 0, 0x400 * sizeof( DffPropFlags ) ); }; - - inline BOOL IsProperty( UINT32 nRecType ) const { return ( mpFlags[ nRecType & 0x3ff ].bSet ); }; - BOOL IsHardAttribute( UINT32 nId ) const; - UINT32 GetPropertyValue( UINT32 nId, UINT32 nDefault = 0 ) const; - /** Returns a boolean property by its real identifier. */ - bool GetPropertyBool( UINT32 nId, bool bDefault = false ) const; - /** Returns a string property. */ - ::rtl::OUString GetPropertyString( UINT32 nId, SvStream& rStrm ) const; - void SetPropertyValue( UINT32 nId, UINT32 nValue ) const; - BOOL SeekToContent( UINT32 nRecType, SvStream& rSt ) const; - void Merge( DffPropSet& rMasterPropSet ) const; - void InitializePropSet() const; - friend SvStream& operator>>( SvStream& rIn, DffPropSet& rPropSet ); -}; - -class SfxItemSet; -class SdrObject; -struct DffObjData; - -class SVX_DLLPUBLIC DffPropertyReader : public DffPropSet -{ - const SvxMSDffManager& rManager; - DffPropSet* pDefaultPropSet; - - void ApplyCustomShapeTextAttributes( SfxItemSet& rSet ) const; - void ApplyCustomShapeAdjustmentAttributes( SfxItemSet& rSet ) const; - void ApplyCustomShapeGeometryAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const; - void ApplyLineAttributes( SfxItemSet& rSet, const MSO_SPT eShapeType ) const; // #i28269# - void ApplyFillAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const; - -public: - - INT32 mnFix16Angle; - - DffPropertyReader( const SvxMSDffManager& rManager ); - ~DffPropertyReader(); - INT32 Fix16ToAngle( INT32 nAngle ) const; - -#ifdef DBG_CUSTOMSHAPE - void ReadPropSet( SvStream& rIn, void* pClientData, UINT32 nShapeType = 0 ) const; -#else - void ReadPropSet( SvStream& rIn, void* pClientData ) const; -#endif - - void SetDefaultPropSet( SvStream& rIn, UINT32 nOffDgg ) const; - void ApplyAttributes( SvStream& rIn, SfxItemSet& rSet ) const; - void ApplyAttributes( SvStream& rIn, SfxItemSet& rSet, const DffObjData& rObjData ) const; -}; - #endif diff --git a/svx/inc/svx/msdffimp.hxx b/svx/inc/svx/msdffimp.hxx deleted file mode 100644 index 4c7c991546..0000000000 --- a/svx/inc/svx/msdffimp.hxx +++ /dev/null @@ -1,773 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: msdffimp.hxx,v $ - * $Revision: 1.4.214.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _MSDFFIMP_HXX -#define _MSDFFIMP_HXX - -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <tools/solar.h> // UINTXX -#include <svtools/svarray.hxx> - -#include <tools/color.hxx> -#include <tools/gen.hxx> -#include <tools/table.hxx> -#include <svx/msdffdef.hxx> -#include <svx/msfiltertracer.hxx> -#include <vcl/graph.hxx> -#include <string.h> - -#include <map> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <svx/svxdllapi.h> - -#include <sot/storage.hxx> - -class Graphic; -class SvStream; -class SdrObject; -class SdrOle2Obj; -class SotStorageRef; -class Polygon; -class PolyPolygon; -class FmFormModel; -class SdrModel; -class DffRecordHeader; - -class SwFlyFrmFmt; - -struct SvxMSDffBLIPInfo; -struct SvxMSDffShapeInfo; -struct SvxMSDffShapeOrder; - -#define COL_DEFAULT RGB_COLORDATA( 0xFA, 0xFB, 0xFC ) - -typedef SvxMSDffBLIPInfo* SvxMSDffBLIPInfo_Ptr; - -typedef SvxMSDffShapeInfo* SvxMSDffShapeInfo_Ptr; - -typedef SvxMSDffShapeOrder* SvxMSDffShapeOrder_Ptr; - -typedef ::std::map< sal_Int32, SdrObject* > SvxMSDffShapeIdContainer; - -#define SVEXT_PERSIST_STREAM "\002OlePres000" - -// nach der Reihenfolge des Auftretens sortiert werden: -// -SV_DECL_PTRARR_DEL(SvxMSDffBLIPInfos, SvxMSDffBLIPInfo_Ptr, 16,16) - -SV_DECL_PTRARR_DEL(SvxMSDffShapeOrders, SvxMSDffShapeOrder_Ptr, 16,16) - -// explizit sortiert werden: -// -SV_DECL_PTRARR_SORT_DEL_VISIBILITY(SvxMSDffShapeInfos, SvxMSDffShapeInfo_Ptr, 16,16, SVX_DLLPUBLIC) - -SV_DECL_PTRARR_SORT_VISIBILITY(SvxMSDffShapeTxBxSort, SvxMSDffShapeOrder_Ptr, 16,16, SVX_DLLPUBLIC) - -#define SVXMSDFF_SETTINGS_CROP_BITMAPS 1 -#define SVXMSDFF_SETTINGS_IMPORT_PPT 2 -#define SVXMSDFF_SETTINGS_IMPORT_EXCEL 4 - -#define SP_FGROUP 0x001 // This shape is a group shape -#define SP_FCHILD 0x002 // Not a top-level shape -#define SP_FPATRIARCH 0x004 // This is the topmost group shape. - // Exactly one of these per drawing. -#define SP_FDELETED 0x008 // The shape has been deleted -#define SP_FOLESHAPE 0x010 // The shape is an OLE object -#define SP_FHAVEMASTER 0x020 // Shape has a hspMaster property -#define SP_FFLIPH 0x040 // Shape is flipped horizontally -#define SP_FFLIPV 0x080 // Shape is flipped vertically -#define SP_FCONNECTOR 0x100 // Connector type of shape -#define SP_FHAVEANCHOR 0x200 // Shape has an anchor of some kind -#define SP_FBACKGROUND 0x400 // Background shape -#define SP_FHAVESPT 0x800 // Shape has a shape type property - -// for the CreateSdrOLEFromStorage we need the information, how we handle -// convert able OLE-Objects - this ist stored in -#define OLE_MATHTYPE_2_STARMATH 0x0001 -#define OLE_WINWORD_2_STARWRITER 0x0002 -#define OLE_EXCEL_2_STARCALC 0x0004 -#define OLE_POWERPOINT_2_STARIMPRESS 0x0008 - -struct SvxMSDffConnectorRule -{ - sal_uInt32 nRuleId; - sal_uInt32 nShapeA; // SPID of shape A - - sal_uInt32 nShapeB; // SPID of shape B - sal_uInt32 nShapeC; // SPID of connector shape - sal_uInt32 ncptiA; // Connection site Index of shape A - sal_uInt32 ncptiB; // Connection site Index of shape B - sal_uInt32 nSpFlagsA; // SpFlags of shape A ( the original mirror flags must be known when solving the Solver Container ) - sal_uInt32 nSpFlagsB; // SpFlags of shape A - - SdrObject* pAObj; // pPtr of object ( corresponding to shape A ) - SdrObject* pBObj; // " - SdrObject* pCObj; // " of connector object - - SvxMSDffConnectorRule() : nSpFlagsA( 0 ), nSpFlagsB( 0 ), pAObj( NULL ), pBObj( NULL ), pCObj( NULL ) {}; - - friend SvStream& operator>>( SvStream& rIn, SvxMSDffConnectorRule& rAtom ); -}; -struct SVX_DLLPUBLIC SvxMSDffSolverContainer -{ - List aCList; - - SvxMSDffSolverContainer(); - ~SvxMSDffSolverContainer(); - - SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, SvxMSDffSolverContainer& rAtom ); -}; - -struct FIDCL -{ - UINT32 dgid; // DG owning the SPIDs in this cluster - UINT32 cspidCur; // number of SPIDs used so far -}; - -//--------------------------------------------------------------------------- -// von SvxMSDffManager fuer jedes in der Gruppe enthaltene Shape geliefert -//--------------------------------------------------------------------------- -struct MSDffTxId -{ - USHORT nTxBxS; - USHORT nSequence; - MSDffTxId(USHORT nTxBxS_, USHORT nSequence_ ) - : nTxBxS( nTxBxS_ ), - nSequence( nSequence_ ){} - MSDffTxId(const MSDffTxId& rCopy) - : nTxBxS( rCopy.nTxBxS ), - nSequence( rCopy.nSequence ){} -}; - -struct SVX_DLLPUBLIC SvxMSDffImportRec -{ - SdrObject* pObj; - Polygon* pWrapPolygon; - char* pClientAnchorBuffer; - UINT32 nClientAnchorLen; - char* pClientDataBuffer; - UINT32 nClientDataLen; - UINT32 nXAlign; - UINT32 nXRelTo; - UINT32 nYAlign; - UINT32 nYRelTo; - UINT32 nLayoutInTableCell; - UINT32 nFlags; - long nTextRotationAngle; - long nDxTextLeft; // Abstand der Textbox vom umgebenden Shape - long nDyTextTop; - long nDxTextRight; - long nDyTextBottom; - long nDxWrapDistLeft; - long nDyWrapDistTop; - long nDxWrapDistRight; - long nDyWrapDistBottom; - long nCropFromTop; - long nCropFromBottom; - long nCropFromLeft; - long nCropFromRight; - MSDffTxId aTextId; // Kennungen fuer Textboxen - ULONG nNextShapeId; // fuer verlinkte Textboxen - ULONG nShapeId; - MSO_SPT eShapeType; - MSO_LineStyle eLineStyle; // Umrandungs-Arten - BOOL bDrawHell :1; - BOOL bHidden :1; - BOOL bReplaceByFly :1; - BOOL bLastBoxInChain :1; - BOOL bHasUDefProp :1; - BOOL bVFlip :1; - BOOL bHFlip :1; - BOOL bAutoWidth :1; - - SvxMSDffImportRec(); - SvxMSDffImportRec(const SvxMSDffImportRec& rCopy); - ~SvxMSDffImportRec(); - BOOL operator==( const SvxMSDffImportRec& rEntry ) const - { return nShapeId == rEntry.nShapeId; } - BOOL operator<( const SvxMSDffImportRec& rEntry ) const - { return nShapeId < rEntry.nShapeId; } -}; -typedef SvxMSDffImportRec* MSDffImportRec_Ptr; - -// Liste aller SvxMSDffImportRec fuer eine Gruppe -SV_DECL_PTRARR_SORT_DEL_VISIBILITY(MSDffImportRecords, MSDffImportRec_Ptr, 16,16, SVX_DLLPUBLIC) - -//--------------------------------------------------------------------------- -// Import-/Export-Parameterblock fuer 1 x ImportObjAtCurrentStreamPos() -//--------------------------------------------------------------------------- -struct SvxMSDffImportData -{ - MSDffImportRecords aRecords; // Shape-Pointer, -Ids und private Daten - Rectangle aParentRect;// Rectangle der umgebenden Gruppe - // bzw. von aussen reingegebenes Rect - Rectangle aNewRect; // mit diesem Shape definiertes Rectangle - - SvxMSDffImportData() - {} - SvxMSDffImportData(const Rectangle& rParentRect) - :aParentRect( rParentRect ) - {} - void SetNewRect(INT32 l, INT32 o, - INT32 r, INT32 u ){ aNewRect = Rectangle(l,o, r,u); } - BOOL HasParRect() const { return aParentRect.IsEmpty(); } - BOOL HasNewRect() const { return aNewRect.IsEmpty() ; } - BOOL HasRecords() const { return 0 != aRecords.Count(); } - USHORT GetRecCount() const { return aRecords.Count(); } - SvxMSDffImportRec* GetRecord(USHORT iRecord) const - { return aRecords.GetObject( iRecord ); } -}; - -struct DffObjData -{ - const DffRecordHeader& rSpHd; - - Rectangle aBoundRect; - Rectangle aChildAnchor; - - UINT32 nShapeId; - UINT32 nSpFlags; - MSO_SPT eShapeType; - - BOOL bShapeType : 1; - BOOL bClientAnchor : 1; - BOOL bClientData : 1; - BOOL bChildAnchor : 1; - BOOL bOpt : 1; - BOOL bIsAutoText : 1; - - int nCalledByGroup; - - DffObjData( const DffRecordHeader& rObjHd, - const Rectangle& rBoundRect, - int nClByGroup ) : - rSpHd( rObjHd ), - aBoundRect( rBoundRect ), - nShapeId( 0 ), - nSpFlags( 0 ), - eShapeType( mso_sptNil ), - bShapeType( FALSE ), - bClientAnchor( FALSE ), - bClientData( FALSE ), - bChildAnchor( FALSE ), - bOpt( FALSE ), - bIsAutoText( FALSE ), - nCalledByGroup( nClByGroup ){} -}; - -#define DFF_RECORD_MANAGER_BUF_SIZE 64 - -struct DffRecordList -{ - UINT32 nCount; - UINT32 nCurrent; - DffRecordList* pPrev; - DffRecordList* pNext; - - DffRecordHeader mHd[ DFF_RECORD_MANAGER_BUF_SIZE ]; - - DffRecordList( DffRecordList* pList ); - ~DffRecordList(); -}; - -enum DffSeekToContentMode -{ - SEEK_FROM_BEGINNING, - SEEK_FROM_CURRENT, - SEEK_FROM_CURRENT_AND_RESTART -}; - -class SVX_DLLPUBLIC DffRecordManager : public DffRecordList -{ - public : - - DffRecordList* pCList; - - void Clear(); - void Consume( SvStream& rIn, BOOL bAppend = FALSE, UINT32 nStOfs = 0 ); - - BOOL SeekToContent( SvStream& rIn, UINT16 nRecType, DffSeekToContentMode eMode = SEEK_FROM_BEGINNING ); - DffRecordHeader* GetRecordHeader( UINT16 nRecType, DffSeekToContentMode eMode = SEEK_FROM_BEGINNING ); - - DffRecordManager(); - DffRecordManager( SvStream& rIn ); - ~DffRecordManager(); - - DffRecordHeader* Current(); - DffRecordHeader* First(); - DffRecordHeader* Next(); - DffRecordHeader* Prev(); - DffRecordHeader* Last(); -}; - -/* - SvxMSDffManager - abstrakte Basis-Klasse fuer Escher-Import - =============== - Zweck: Zugriff auf Objekte im Drawing File Format - Stand: Zugriff nur auf BLIPs (wird spaeter erweitert) - - Beachte: in der zwecks PowerPoint-, ODER Word- ODER Excel-Import - ======== abgeleiteten Klasse - MUSS jeweils die Methode ProcessUserDefinedRecord() - implementiert werden! -*/ -class SVX_DLLPUBLIC SvxMSDffManager : public DffPropertyReader -{ - FmFormModel* pFormModel; - SvxMSDffBLIPInfos* pBLIPInfos; - SvxMSDffShapeInfos* pShapeInfos; - SvxMSDffShapeOrders* pShapeOrders; - ULONG nDefaultFontHeight; - long nOffsDgg; - USHORT nBLIPCount; - USHORT nShapeCount; - sal_uInt32 nGroupShapeFlags; - - void CheckTxBxStoryChain(); - void GetFidclData( long nOffsDgg ); - -protected : - - String maBaseURL; - UINT32 mnCurMaxShapeId; // we need this information to - UINT32 mnDrawingsSaved; // access the right drawing - UINT32 mnIdClusters; // while only knowing the shapeid - FIDCL* mpFidcls; - Table maDgOffsetTable; // array of fileoffsets - - friend class DffPropertyReader; - - SvStream& rStCtrl; - SvStream* pStData; - SvStream* pStData2; - SdrModel* pSdrModel; - - long nMapMul; - long nMapDiv; - long nMapXOfs; - long nMapYOfs; - long nEmuMul; - long nEmuDiv; - long nPntMul; - long nPntDiv; - FASTBOOL bNeedMap; - UINT32 nSvxMSDffSettings; - UINT32 nSvxMSDffOLEConvFlags; - - /** stores a reference to an imported SdrObject with its shape id if - it has one - */ - SvxMSDffShapeIdContainer maShapeIdContainer; - - void GetCtrlData( long nOffsDgg ); - void GetDrawingGroupContainerData( SvStream& rSt, - ULONG nLenDgg ); - // --> OD 2008-08-01 #156763# - // Add internal drawing container id as parameter to the sub methods of - // reading the control information about the drawing objects. - // The drawing container id is used to distinguish the text ids of drawing - // objects in different drawing containers. - void GetDrawingContainerData( SvStream& rSt, - ULONG nLenDg, - const unsigned long nDrawingContainerId ); - BOOL GetShapeGroupContainerData( SvStream& rSt, - ULONG nLenShapeGroupCont, - BOOL bPatriarch, - const unsigned long nDrawingContainerId ); - BOOL GetShapeContainerData( SvStream& rSt, - ULONG nLenShapeCont, - ULONG nPosGroup, - const unsigned long nDrawingContainerId ); - // <-- - - FASTBOOL ReadGraphic( SvStream& rSt, ULONG nIndex, Graphic& rGraphic ) const; - SdrObject* ImportFontWork( SvStream&, SfxItemSet&, Rectangle& rBoundRect ) const; - SdrObject* ImportGraphic( SvStream&, SfxItemSet&, const DffObjData& ) const; - // --> OD 2004-12-14 #i32596# - pass <nCalledByGroup> to method - // Needed in the Writer Microsoft Word import to avoid import of OLE objects - // inside groups. Instead a graphic object is created. - virtual SdrObject* ImportOLE( long nOLEId, - const Graphic& rGraf, - const Rectangle& rBoundRect, - const Rectangle& rVisArea, - const int _nCalledByGroup, - sal_Int64 nAspect ) const; - // <-- - SdrObject* GetAutoForm( MSO_SPT eTyp ) const; - static const GDIMetaFile* lcl_GetMetaFileFromGrf_Impl( const Graphic& rGrf, GDIMetaFile& rMtf ); -#ifndef SVX_LIGHT - static com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > CheckForConvertToSOObj( - UINT32 nConvertFlags, SotStorage& rSrcStg, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg, - const Graphic& rGrf, - const Rectangle& rVisArea ); -#endif - -/* - folgende Methoden sind zum Excel-Import zu ueberschreiben: -*/ - virtual BOOL ProcessClientAnchor(SvStream& rStData, ULONG nDatLen, char*& rpBuff, UINT32& rBuffLen ) const; - virtual void ProcessClientAnchor2( SvStream& rStData, DffRecordHeader& rHd, void* pData, DffObjData& ); - virtual BOOL ProcessClientData( SvStream& rStData, ULONG nDatLen, char*& rpBuff, UINT32& rBuffLen ) const; - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj = NULL); - virtual ULONG Calc_nBLIPPos( ULONG nOrgVal, ULONG nStreamPos ) const; - virtual FASTBOOL GetColorFromPalette(USHORT nNum, Color& rColor) const; - - // ----------------------------------------------------------------------- - - FASTBOOL ReadDffString(SvStream& rSt, String& rTxt) const; - FASTBOOL ReadObjText(SvStream& rSt, SdrObject* pObj) const; - - // SJ: New implementation of ReadObjText is used by Fontwork objects, because - // the old one does not properly import multiple paragraphs - void ReadObjText( const String& rText, SdrObject* pObj ) const; - // ----------------------------------------------------------------------- - - /* - folgende Methode ist von allen zu ueberschreiben, die OLE-Objecte - importieren moechten: - */ - virtual BOOL GetOLEStorageName( long nOLEId, String& rStorageName, - SotStorageRef& rSrcStorage, - com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg - ) const; - - /* - folgende Methode ist von allen zu ueberschreiben, die verhindern - moechten, dass (abgerundete) Rechtecke mit umgebrochenem Text - immer in SdrRectObj( OBJ_TEXT ) umgewandelt werden: - TRUE bedeutet umwandeln. - */ - virtual BOOL ShapeHasText(ULONG nShapeId, ULONG nFilePos) const; - -public: - - void* pSvxMSDffDummy1; - void* pSvxMSDffDummy2; - void* pSvxMSDffDummy3; - List* pEscherBlipCache; - - DffRecordManager maShapeRecords; - ColorData mnDefaultColor; - - MSFilterTracer* mpTracer; - sal_Bool mbTracing; - - Color MSO_TEXT_CLR_ToColor( sal_uInt32 nColorCode ) const; - Color MSO_CLR_ToColor( sal_uInt32 nColorCode, sal_uInt16 nContextProperty = DFF_Prop_lineColor ) const; - virtual BOOL SeekToShape( SvStream& rSt, void* pClientData, UINT32 nId ) const; - FASTBOOL SeekToRec( SvStream& rSt, USHORT nRecId, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const; - FASTBOOL SeekToRec2( USHORT nRecId1, USHORT nRecId2, ULONG nMaxFilePos, DffRecordHeader* pRecHd = NULL, ULONG nSkipCount = 0 ) const; - - // ----------------------------------------------------------------------- - static void MSDFFReadZString( SvStream& rIn, String& rStr, ULONG nMaxLen, FASTBOOL bUniCode = FALSE ); - - static BOOL ReadCommonRecordHeader( DffRecordHeader& rRec, SvStream& rIn ); - static BOOL ReadCommonRecordHeader( SvStream& rSt, - BYTE& rVer, - USHORT& rInst, - USHORT& rFbt, - UINT32& rLength ); -/* - Konstruktor - =========== - Input: rStCtrl - Verwaltungsstream mit Containern, - FBSE Objekten und Shapes - ( muss immer uebergeben werden; - Stream muss bereits offen sein ) - - nOffsDgg - Offset im rStCtrl: Beginn des Drawing Group Containers - - pStData - Datenstream, in dem die BLIPs gespeichert sind - ( falls Null, wird angenommen, dass die - BLIPs ebenfalls im rStCtrl gespeichert sind; - dieser Stream muss ebenfalls bereits offen sein ) - pSdrModel_ kann beim Ctor-Aufruf leer bleiben, muss dann aber - spaeter ueber SetModel() gesetzt werden! - - setzt nBLIPCount -*/ - SvxMSDffManager( SvStream& rStCtrl, - const String& rBaseURL, - long nOffsDgg, - SvStream* pStData, - SdrModel* pSdrModel_ = 0, - long nApplicationScale = 0, - ColorData mnDefaultColor_ = COL_DEFAULT, - ULONG nDefaultFontHeight_ = 24, - SvStream* pStData2_ = 0, - MSFilterTracer* pTracer = NULL ); - - // in PPT werden die Parameter DGGContainerOffset und PicStream - // mit Hilfe einer Init Routine Uebergeben. - SvxMSDffManager( SvStream& rStCtrl, const String& rBaseURL, MSFilterTracer* pTracer ); - void InitSvxMSDffManager( long nOffsDgg_, SvStream* pStData_, sal_uInt32 nSvxMSDffOLEConvFlags ); - void SetDgContainer( SvStream& rSt ); - - virtual ~SvxMSDffManager(); - - UINT32 GetSvxMSDffSettings() const { return nSvxMSDffSettings; }; - void SetSvxMSDffSettings( UINT32 nSettings ) { nSvxMSDffSettings = nSettings; }; - - static BOOL MakeContentStream( SotStorage * pStor, const GDIMetaFile & ); - static BOOL ConvertToOle2( SvStream& rStm, UINT32 nLen, const GDIMetaFile*, - const SotStorageRef & rDest ); - - void SetModel(SdrModel* pModel, long nApplicationScale); - SdrModel* GetModel() const { return pSdrModel; } - void Scale(sal_Int32& rVal) const; - void Scale(Point& rPos) const; - void Scale(Size& rSiz) const; - void Scale(Rectangle& rRect) const; - void Scale(Polygon& rPoly) const; - void Scale(PolyPolygon& rPoly) const; - void ScaleEmu(sal_Int32& rVal) const; - UINT32 ScalePt( UINT32 nPt ) const; - INT32 ScalePoint( INT32 nVal ) const; - -/* - GetBLIP() - Anforderung eines bestimmten BLIP - ========= - Input: nIdx - Nummer des angeforderten BLIP - ( muss immer uebergeben werden ) - - Output: rData - bereits fertig konvertierte Daten - ( direkt als Grafik in unsere Dokumente einzusetzen ) - - Rueckgabewert: TRUE, im Erfolgsfalls, FALSE bei Fehler -*/ - BOOL GetBLIP( ULONG nIdx, Graphic& rData, Rectangle* pVisArea = NULL ) const; - -/* - GetBLIPDirect() -Einlesen eines BLIP aus schon positioniertem Stream - =============== - Input: rBLIPStream -bereits korrekt positionierter Stream - ( muss immer uebergeben werden ) - - Output: rData -bereits fertig konvertierte Daten - ( direkt als Grafik in unsere Dokumente einzusetzen ) - - Rueckgabewert: TRUE, im Erfolgsfalls, FALSE bei Fehler -*/ - BOOL GetBLIPDirect(SvStream& rBLIPStream, Graphic& rData, Rectangle* pVisArea = NULL ) const; - - BOOL GetShape(ULONG nId, - SdrObject*& rpData, SvxMSDffImportData& rData); - -/* - GetBLIPCount() - Abfrage der verwalteten BLIP Anzahl - ============== - Input: ./. - Output: ./. - Rueckgabewert: nBLIPCount - Anzahl der im pStData (bzw. rStCtrl) enthaltenen BLIPs - ( sprich: Anzahl der FBSEs im Drawing Group Container ) - - Werte: 0 - Struktur Ok, jedoch keine BLIPs vorhanden - 1.. - Anzahl der BLIPs - USHRT_MAX - Fehler: kein korrektes Drawing File Format -*/ - USHORT GetBLIPCount() const{ return nBLIPCount; } - -/* - ZCodecDecompressed() - Dekomprimierung eines komp. WMF oder Enhanced WMF - ==================== - Input: rIn -bereits korrekt positionierter Stream, - der das komprimierte Bild enthaelt - rOut -bereits korrekt positionierter Ausgabe-Stream, - - bLookForEnd -Flag, ob das komp. Bild bis zum Stream-Ende reicht. - Falls TRUE, wird jeweils geprueft, ob das gelesene noch - zum Bild gehoert. - Falls FALSE, wird bis zum Stream-Ende gelesen. - - Output: rIn -Der Stream steht hinter dem Ende des komp. Bildes. - (es kann aber noch eine Ende-Kennung und CRC-Sum folgen) - rOut -Der Stream enthaelt das dekomprimierte Bild. - Der Stream wird auf den Anfang des Bildes positioniert. - (also dorthin, wo der Stream vor der Verarbeitung stand) - - Rueckgabewert: TRUE, im Erfolgsfall - FALSE bei Fehler oder Null Bytes geschrieben -*/ -// static BOOL ZCodecDecompressed( SvStream& rIn, -// SvStream& rOut, -// BOOL bLookForEnd ); -// - SdrObject* ImportObj(SvStream& rSt, void* pData, - Rectangle& rClientRect, const Rectangle& rGlobalChildRect, int nCalledByGroup = 0, sal_Int32* pShapeId = NULL); - - SdrObject* ImportGroup( const DffRecordHeader& rHd, SvStream& rSt, void* pData, - Rectangle& rClientRect, const Rectangle& rGlobalChildRect, int nCalledByGroup = 0, sal_Int32* pShapeId = NULL ); - - SdrObject* ImportShape( const DffRecordHeader& rHd, SvStream& rSt, void* pData, - Rectangle& rClientRect, const Rectangle& rGlobalChildRect, int nCalledByGroup = 0, sal_Int32* pShapeId = NULL); - - Rectangle GetGlobalChildAnchor( const DffRecordHeader& rHd, SvStream& rSt, Rectangle& aClientRect ); - void GetGroupAnchors( const DffRecordHeader& rHd, SvStream& rSt, - Rectangle& rGroupClientAnchor, Rectangle& rGroupChildAnchor, - const Rectangle& rClientRect, const Rectangle& rGlobalChildRect ); - - inline const SvxMSDffShapeInfos* GetShapeInfos( void ) const - { - return pShapeInfos; - } - - inline const SvxMSDffShapeOrders* GetShapeOrders( void ) const - { - return pShapeOrders; - } - - void StoreShapeOrder(ULONG nId, - ULONG nTxBx, - SdrObject* pObject, - SwFlyFrmFmt* pFly = 0, - short nHdFtSection = 0) const; - - void ExchangeInShapeOrder(SdrObject* pOldObject, - ULONG nTxBx, - SwFlyFrmFmt* pFly, - SdrObject* pObject) const; - - void RemoveFromShapeOrder( SdrObject* pObject ) const; - - UINT32 GetConvertFlags() const { return nSvxMSDffOLEConvFlags; } - - static SdrOle2Obj* CreateSdrOLEFromStorage( const String& rStorageName, - SotStorageRef& rSrcStorage, - const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xDestStg, - const Graphic& rGraf, - const Rectangle& rBoundRect, - const Rectangle& rVisArea, - SvStream* pDataStrrm, - ErrCode& rError, - UINT32 nConvertFlags, - sal_Int64 nAspect ); - - /* the method SolveSolver will create connections between shapes, it should be called after a page is imported. - The SvxMSDffSolverContainer is containing necessary data data that is collected during the import of each shape - */ - void SolveSolver( const SvxMSDffSolverContainer& rSolver ); - - static sal_Bool SetPropValue( - const ::com::sun::star::uno::Any& rAny, - const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rXPropSet, - const String& rPropertyName, - sal_Bool bTestPropertyAvailability = sal_False ); - - void insertShapeId( sal_Int32 nShapeId, SdrObject* pShape ); - void removeShapeId( SdrObject* pShape ); - SdrObject* getShapeForId( sal_Int32 nShapeId ); -}; - -struct SvxMSDffBLIPInfo -{ - USHORT nBLIPType; // Art des BLIP: z.B. 6 fuer PNG - ULONG nFilePos; // Offset des BLIP im Daten-Stream - ULONG nBLIPSize; // Anzahl Bytes, die der BLIP im Stream einnimmt - SvxMSDffBLIPInfo(USHORT nBType, ULONG nFPos, ULONG nBSize): - nBLIPType( nBType ), nFilePos( nFPos ), nBLIPSize( nBSize ){} -}; - -struct SvxMSDffShapeInfo -{ - sal_uInt32 nShapeId; // Shape Id, verwendet im PLCF SPA und im mso_fbtSp (FSP) - ULONG nFilePos; // Offset des Shape im Kontroll-Stream fuer eventuelle - // erneute Zugriffe auf dieses Shape - sal_uInt32 nTxBxComp; - - BOOL bReplaceByFly :1; // Shape darf im Writer durch Rahmen ersetzt werden. - BOOL bSortByShapeId :1; - BOOL bLastBoxInChain:1; - - SvxMSDffShapeInfo(ULONG nFPos, sal_uInt32 nId=0, // ULONG nBIdx=0, - USHORT nSeqId=0, USHORT nBoxId=0): - nShapeId( nId ), - nFilePos( nFPos ), - nTxBxComp( (nSeqId << 16) + nBoxId ) - { - bReplaceByFly = FALSE; - bSortByShapeId = FALSE; - bLastBoxInChain = TRUE; - } - SvxMSDffShapeInfo(SvxMSDffShapeInfo& rInfo): - nShapeId( rInfo.nShapeId ), - nFilePos( rInfo.nFilePos ), - nTxBxComp( rInfo.nTxBxComp ) - { - bReplaceByFly = rInfo.bReplaceByFly; - bSortByShapeId = rInfo.bSortByShapeId; - bLastBoxInChain = rInfo.bLastBoxInChain; - } - BOOL operator==( const SvxMSDffShapeInfo& rEntry ) const - { - return bSortByShapeId ? (nShapeId == rEntry.nShapeId) - : (nTxBxComp == rEntry.nTxBxComp && this == &rEntry); - } - BOOL operator<( const SvxMSDffShapeInfo& rEntry ) const - { - return bSortByShapeId ? (nShapeId < rEntry.nShapeId) - : (nTxBxComp < rEntry.nTxBxComp); - } -}; - -struct SvxMSDffShapeOrder -{ - ULONG nShapeId; // Shape Id, verwendet im PLCF SPA und im mso_fbtSp (FSP) - - ULONG nTxBxComp; // Ketten- und Boxnummer in der Text-Box-Story (bzw. Null) - - SwFlyFrmFmt* pFly; // Frame-Format eines statt des Sdr-Text-Objektes im - // Writer eingefuegten Rahmens: zur Verkettung benoetigt! - - short nHdFtSection; // used by Writer to find out if linked frames are in the - // same header or footer of the same section - - SdrObject* pObj; // Zeiger auf das Draw-Objekt (bzw. Null, falls nicht verwendet) - - // Vorgehensweise: im Ctor des SvxMSDffManager werden im der Shape-Order-Array - // nur die Shape-Ids vermerkt, - // Text-Box-Nummer und der Objekt-Pointer werden nur dann - // gespeichert, wenn das Shape tatsaechlich importiert wird! - SvxMSDffShapeOrder( ULONG nId ): - nShapeId( nId ), nTxBxComp( 0 ), pFly( 0 ), nHdFtSection( 0 ), pObj( 0 ){} - - BOOL operator==( const SvxMSDffShapeOrder& rEntry ) const - { - return (nTxBxComp == rEntry.nTxBxComp); - } - BOOL operator<( const SvxMSDffShapeOrder& rEntry ) const - { - return (nTxBxComp < rEntry.nTxBxComp); - } -}; - -#endif - diff --git a/svx/inc/svx/msfiltertracer.hxx b/svx/inc/svx/msfiltertracer.hxx deleted file mode 100644 index cfb6c895f7..0000000000 --- a/svx/inc/svx/msfiltertracer.hxx +++ /dev/null @@ -1,99 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: msfiltertracer.hxx,v $ - * $Revision: 1.3 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _MS_FILTERTRACER_HXX -#define _MS_FILTERTRACER_HXX - -#include <rtl/ustring.hxx> -#include <tools/stream.hxx> -#include <xmloff/attrlist.hxx> -#include <com/sun/star/uno/Any.h> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/util/XTextSearch.hpp> -#include <com/sun/star/util/SearchResult.hpp> -#include <com/sun/star/util/logging/XLogger.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include "svx/svxdllapi.h" - -class FilterConfigItem; -class SVX_DLLPUBLIC MSFilterTracer -{ - FilterConfigItem* mpCfgItem; - SvXMLAttributeList* mpAttributeList; - SvStream* mpStream; - sal_Bool mbEnabled; - - ::com::sun::star::util::SearchOptions maSearchOptions; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxFilterTracer; - ::com::sun::star::uno::Reference< ::com::sun::star::util::XTextSearch > mxTextSearch; - - ::com::sun::star::uno::Reference< ::com::sun::star::util::logging::XLogger > mxLogger; - ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler > mxHandler; - - public : - - /* The first parameter is expecting the path of the configuration file. - The second parameter can be used to override properties of the configuration - file. A "DocumentURL" property can be set in the property - sequence to provide the current url of the document. - If the "Path" property is not set in the configuration file, then the path - of the "DocumentURL" property is used instead. If both are not set, the - application path is used instead. - If the "Name" property is not set in the configuration file, then the name - of the "DocumentURL" property is used instead. If both are not set, the - name "tracer* is used. - The file extension will always be "log" */ - - MSFilterTracer( const ::rtl::OUString& rConfigurationPath, - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pConfigData = NULL ); - ~MSFilterTracer(); - - void StartTracing(); - void EndTracing(); - - inline sal_Bool IsEnabled() const { return mbEnabled; } - - void StartElement( const ::rtl::OUString& rName, ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > xAttribs ); - void EndElement( const ::rtl::OUString& rName ); - - void Trace( const ::rtl::OUString& rElementID, const ::rtl::OUString& rMessage ); - void AddAttribute( const ::rtl::OUString &sName , const ::rtl::OUString &sValue ); - void RemoveAttribute( const ::rtl::OUString& sName ); - void ClearAttributes(); - - /* initially all properties of the configuration file and the - properties which are given to the c'tor can be retrieved */ - ::com::sun::star::uno::Any GetProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any* pDefault = NULL ) const; - void SetProperty( const ::rtl::OUString& rPropName, const ::com::sun::star::uno::Any& rProperty ); -}; - -#endif diff --git a/svx/inc/svx/msocximex.hxx b/svx/inc/svx/msocximex.hxx deleted file mode 100644 index c9b7b817cd..0000000000 --- a/svx/inc/svx/msocximex.hxx +++ /dev/null @@ -1,1423 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: msocximex.hxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _MSOCXIMEX_HXX -#define _MSOCXIMEX_HXX - -#include <sot/storage.hxx> -#include <tools/debug.hxx> - -//!! no such defines in global namespaces - it will break other existing code that uses the same define!! -//#ifndef C2U -//#define C2U(cChar) rtl::OUString::createFromAscii(cChar) -//#endif -#include "svx/svxdllapi.h" -#include <vector> -#include <hash_map> - -namespace com{namespace sun{namespace star{ - namespace drawing{ - class XDrawPage; - class XShape; - class XShapes; - } - namespace form{ - class XFormComponent; - } - namespace lang{ - class XMultiServiceFactory; - } - namespace container{ - class XIndexContainer; - class XNameContainer; - } - namespace beans{ - class XPropertySet; - } - namespace text{ - class XText; - } - namespace awt{ - struct Size; - class XControlModel; - } - namespace uno{ - class XComponentContext; - } - -}}} - -class OCX_Control; -class SfxObjectShell; -class SwPaM; - -class TypeName -{ -public: - String msName; - sal_uInt16 mnType; - sal_Int32 mnLeft; - sal_Int32 mnTop; - sal_Int32 mnStoreId; - TypeName(sal_Char *pName, sal_uInt32 nStoreId, sal_uInt32 nLen, sal_uInt16 nType, - sal_Int32 nLeft, sal_Int32 nTop); -}; - - -class SVX_DLLPUBLIC SvxMSConvertOCXControls -{ -public: - SvxMSConvertOCXControls( SfxObjectShell *pDSh,SwPaM *pP ); - virtual ~SvxMSConvertOCXControls(); - - //Reads a control from the given storage, constructed shape in pShapeRef - sal_Bool ReadOCXStream( SotStorageRef& rSrc1, - com::sun::star::uno::Reference< - com::sun::star::drawing::XShape > *pShapeRef=0, - BOOL bFloatingCtrl=FALSE ); - - - //Excel has a nasty kludged mechanism for this, read - //the comments in the source to follow it - sal_Bool ReadOCXExcelKludgeStream(SotStorageStreamRef& rSrc1, - com::sun::star::uno::Reference < - com::sun::star::drawing::XShape > *pShapeRef,BOOL bFloatingCtrl); - - - //Writes the given Uno Control into the given storage - - static sal_Bool WriteOCXStream(SotStorageRef &rSrc1, - const com::sun::star::uno::Reference< - com::sun::star::awt::XControlModel > &rControlModel, - const com::sun::star::awt::Size& rSize,String &rName); - - //Excel has a nasty kludged mechanism for this, read - //the comments in the source to follow it - static sal_Bool WriteOCXExcelKludgeStream(SotStorageStreamRef& rContents, - const com::sun::star::uno::Reference< - com::sun::star::awt::XControlModel > &rControlModel, - const com::sun::star::awt::Size &rSize, String &rName); - - //Generate an OCX converter based on the OLE2 name - static OCX_Control *OCX_Factory(const String &rId); - - //Generate an OCX converter based on the StarOffice UNO id - static OCX_Control *OCX_Factory( const com::sun::star::uno::Reference< - com::sun::star::awt::XControlModel > &rControlModel, - String &rId,String &rName); - - virtual sal_Bool InsertControl( - const com::sun::star::uno::Reference< - com::sun::star::form::XFormComponent >& /*rFComp*/, - const com::sun::star::awt::Size& /*rSize*/, - com::sun::star::uno::Reference< - com::sun::star::drawing::XShape >* /*pShape*/, - BOOL /*bFloatingCtrl*/ ) {return sal_False;} - - /*begin: Backwards compatability with office 95 import, modify later*/ - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > & GetServiceFactory(); - - sal_uInt16 GetEditNum() { return ++nEdit; } - sal_uInt16 GetCheckboxNum() { return ++nCheckbox; } - /*end: Backwards compatability*/ -protected: - const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > & - GetShapes(); - - const com::sun::star::uno::Reference< - com::sun::star::container::XIndexContainer > & GetFormComps(); - - SfxObjectShell *pDocSh; - SwPaM *pPaM; - - // gecachte Interfaces - com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > - xDrawPage; - com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > - xShapes; - com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > xServiceFactory; - - // das einzige Formular - com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > - xFormComps; - - sal_uInt16 nEdit; - sal_uInt16 nCheckbox; - - virtual const com::sun::star::uno::Reference< - com::sun::star::drawing::XDrawPage > & GetDrawPage(); -}; - -class OCX_FontData -{ -public: - OCX_FontData() : nFontNameLen(0), fBold(0), fItalic(0), fUnderline(0), - fStrike(0), nFontSize(12), nJustification(1), pFontName(0), - bHasAlign(FALSE), bHasFont(TRUE) {} - ~OCX_FontData() { - if (pFontName) - delete [] pFontName; - } - sal_Bool Read(SotStorageStream *pS); - void Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > &rPropSet); - - sal_Bool Export(SotStorageStreamRef &rContent, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - - sal_uInt16 nIdentifier; - sal_uInt16 nFixedAreaLen; - sal_uInt8 pBlockFlags[4]; - - sal_uInt32 nFontNameLen; - - sal_uInt8 fBold:1; - sal_uInt8 fItalic:1; - sal_uInt8 fUnderline:1; - sal_uInt8 fStrike:1; - sal_uInt8 fUnknown1:4; - - sal_uInt8 nUnknown2; - sal_uInt8 nUnknown3; - sal_uInt8 nUnknown4; - - sal_uInt32 nFontSize; - sal_uInt16 nLanguageID; - sal_uInt8 nJustification; - sal_uInt16 nFontWeight; - - char *pFontName; - void SetHasAlign(sal_Bool bIn) {bHasAlign=bIn;} - void SetHasFont(sal_Bool bIn) {bHasFont=bIn;} -protected: - static sal_uInt16 nStandardId; - sal_uInt8 ExportAlign(sal_Int16 nAlign) const; - sal_Int16 ImportAlign(sal_uInt8 nJustification) const; -private: - sal_Bool bHasAlign; - sal_Bool bHasFont; -}; - -class SVX_DLLPUBLIC OCX_Control -{ -public: - OCX_Control(UniString sN, OCX_Control* parent = NULL ) : nWidth( 0 ), nHeight( 0 ), mnLeft(0), mnTop(0), - mnStep(0), mnBackColor(0x8000000FL), mnForeColor(0), mnTabPos(0), mbVisible(true), sName(sN), pDocSh(0), - bSetInDialog(FALSE), mpParent( parent ) {} - sal_Bool FullRead(SotStorageStream *pS) - { - return Read(pS) && ReadFontData(pS); - }; - virtual sal_Bool Read(SotStorageStream *pS); - virtual sal_Bool ReadFontData(SotStorageStream *pS); - virtual sal_Bool Import(const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > &rServiceFactory, - com::sun::star::uno::Reference< - com::sun::star::form::XFormComponent > &rFComp, - com::sun::star::awt::Size &rSz); - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::container::XNameContainer> - &rDialog); - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet>& /*rPropSet*/) - {return sal_False;} - //Export exports a control as an OLE style storage stream tree - virtual sal_Bool Export(SotStorageRef& /*rObj*/, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet>& /*rPropSet*/, - const com::sun::star::awt::Size& /*rSize*/) {return sal_False;} - - //WriteContents writes the contents of a contents stream, for - //the Excel export you cannot use Export, only WriteContents instead - virtual sal_Bool WriteContents(SotStorageStreamRef& /*rObj*/, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet>& /*rPropSet*/, - const com::sun::star::awt::Size& /*rSize*/) {return sal_False;} - void SetInDialog(bool bState) { bSetInDialog = bState; } - bool GetInDialog() { return bSetInDialog; } - - sal_Bool ReadAndImport(SotStorageStream *pS, - com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory > &rSF, - com::sun::star::uno::Reference< - com::sun::star::form::XFormComponent > &rFComp, - com::sun::star::awt::Size &rSz) - { - if (Read(pS)) - return Import(rSF,rFComp,rSz); - return sal_False; - } - virtual ~OCX_Control() {} - - static void FillSystemColors(); - - sal_uInt32 nWidth; - sal_uInt32 nHeight; - sal_Int32 mnLeft; - sal_Int32 mnTop; - sal_Int32 mnStep; - sal_Int32 mnBackColor; - sal_Int32 mnForeColor; - sal_uInt16 mnTabPos; - bool mbVisible; - UniString sName; - UniString msToolTip; - OCX_FontData aFontData; - SfxObjectShell *pDocSh; -protected: - - sal_uInt32 ImportColor(sal_uInt32 nColorCode) const; - sal_uInt32 ExportColor(sal_uInt32 nColorCode) const; - sal_uInt32 SwapColor(sal_uInt32 nColorCode) const; - sal_Int16 ImportBorder(sal_uInt16 nSpecialEffect,sal_uInt16 nBorderStyle) - const; - sal_uInt8 ExportBorder(sal_uInt16 nBorder,sal_uInt8 &rBorderStyle) const; - bool bSetInDialog; - sal_Int16 ImportSpecEffect( sal_uInt8 nSpecialEffect ) const; - sal_uInt8 ExportSpecEffect( sal_Int16 nApiEffect ) const; - static sal_uInt16 nStandardId; - static sal_uInt8 __READONLY_DATA aObjInfo[4]; - rtl::OUString msFormType; - rtl::OUString msDialogType; - OCX_Control* mpParent; -private: - static sal_uInt32 pColor[25]; -}; - -class OCX_ModernControl : public OCX_Control -{ -public: - OCX_ModernControl(UniString sN) : OCX_Control(sN), - fEnabled(1), fLocked(0), fBackStyle(1), fColumnHeads(0), fIntegralHeight(1), - fMatchRequired(0), fAlignment(1), fDragBehaviour(0), fEnterKeyBehaviour(0), - fEnterFieldBehaviour(0), fTabKeyBehaviour(0), fWordWrap(1), - fSelectionMargin(1), fAutoWordSelect(1), fAutoSize(0), fHideSelection(1), - fAutoTab(0), fMultiLine(1), nMaxLength(0), nBorderStyle(0), nScrollBars(0), - nStyle(0), nMousePointer(0), nPasswordChar(0), nListWidth(0), - nBoundColumn(1), nTextColumn(-1), nColumnCount(1), nListRows(8), - nMatchEntry(2), nListStyle(0), nShowDropButtonWhen(0), nDropButtonStyle(1), - nMultiState(0), nValueLen(0), nCaptionLen(0), nVertPos(1), nHorzPos(7), - nSpecialEffect(2), nIcon(0), nPicture(0), nAccelerator(0), nGroupNameLen(0), - pValue(0), pCaption(0), pGroupName(0), nIconLen(0), pIcon(0), - nPictureLen(0), pPicture(0) {} - - ~OCX_ModernControl() { - if (pValue) delete[] pValue; - if (pCaption) delete[] pCaption; - if (pGroupName) delete[] pGroupName; - if (pIcon) delete[] pIcon; - if (pPicture) delete[] pPicture; - } - sal_Bool Read(SotStorageStream *pS); - - - /*sal_uInt8 for sal_uInt8 Word Struct*/ - sal_uInt16 nIdentifier; - sal_uInt16 nFixedAreaLen; - sal_uInt8 pBlockFlags[8]; - - sal_uInt8 fUnknown1:1; - sal_uInt8 fEnabled:1; - sal_uInt8 fLocked:1; - sal_uInt8 fBackStyle:1; - sal_uInt8 fUnknown2:4; - - sal_uInt8 fUnknown3:2; - sal_uInt8 fColumnHeads:1; - sal_uInt8 fIntegralHeight:1; - sal_uInt8 fMatchRequired:1; - sal_uInt8 fAlignment:1; - sal_uInt8 fUnknown4:2; - - sal_uInt8 fUnknown5:3; - sal_uInt8 fDragBehaviour:1; - sal_uInt8 fEnterKeyBehaviour:1; - sal_uInt8 fEnterFieldBehaviour:1; - sal_uInt8 fTabKeyBehaviour:1; - sal_uInt8 fWordWrap:1; - - sal_uInt8 fUnknown6:2; - sal_uInt8 fSelectionMargin:1; - sal_uInt8 fAutoWordSelect:1; - sal_uInt8 fAutoSize:1; - sal_uInt8 fHideSelection:1; - sal_uInt8 fAutoTab:1; - sal_uInt8 fMultiLine:1; - - sal_uInt32 nMaxLength; - sal_uInt8 nBorderStyle; - sal_uInt8 nScrollBars; - sal_uInt8 nStyle; - sal_uInt8 nMousePointer; - sal_uInt8 nUnknown7; - sal_uInt8 nPasswordChar; - sal_uInt32 nListWidth; - sal_uInt16 nBoundColumn; - sal_Int16 nTextColumn; - sal_uInt16 nColumnCount; - sal_uInt16 nListRows; - sal_uInt16 nUnknown8; - sal_uInt8 nMatchEntry; - sal_uInt8 nListStyle; - sal_uInt8 nShowDropButtonWhen; - sal_uInt8 nDropButtonStyle; - sal_uInt8 nMultiState; - sal_uInt32 nValueLen; - sal_uInt32 nCaptionLen; - - sal_uInt16 nVertPos; - sal_uInt16 nHorzPos; - - sal_uInt32 nBorderColor; - sal_uInt8 nSpecialEffect; - sal_uInt16 nIcon; - sal_uInt16 nPicture; - sal_uInt8 nAccelerator; - sal_uInt8 nUnknown9; - sal_uInt32 nGroupNameLen; - sal_uInt32 nUnknown10; - - char *pValue; - char *pCaption; - char *pGroupName; - - sal_uInt8 pIconHeader[20]; - sal_uInt32 nIconLen; - sal_uInt8 *pIcon; - - sal_uInt8 pPictureHeader[20]; - sal_uInt32 nPictureLen; - sal_uInt8 *pPicture; - -}; - -class OCX_TabStrip : public OCX_Control -{ -public: - OCX_TabStrip() : OCX_Control( rtl::OUString::createFromAscii("TabStrip")) {} - virtual sal_Bool ReadFontData(SotStorageStream *pS); - virtual sal_Bool Read(SotStorageStream *pS); - - sal_uInt16 nIdentifier; - sal_uInt16 nFixedAreaLen; - sal_uInt8 pBlockFlags[4]; - sal_uInt16 nNumTabs; -}; - -class OCX_Image : public OCX_Control -{ -public: - OCX_Image() : OCX_Control(rtl::OUString::createFromAscii("Image")), fEnabled(1), fBackStyle(0), bPictureTiling(false), bAutoSize(false) { - msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.DatabaseImageControl"); - msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlImageControlModel"); - } - - ~OCX_Image() { } - /*sal_uInt8 for sal_uInt8 Word Struct*/ - sal_uInt16 nIdentifier; - sal_uInt16 nFixedAreaLen; - sal_uInt8 pBlockFlags[4]; - - sal_uInt32 nBorderColor; - sal_uInt8 nBorderStyle; - sal_uInt8 nMousePointer; - sal_uInt8 nPictureSizeMode; - - - sal_uInt8 fUnknown1:1; - sal_uInt8 fEnabled:1; - sal_uInt8 fUnknown2:2; - sal_uInt8 fBackStyle:1; - sal_uInt8 fUnknown3:3; - - sal_uInt8 nPictureAlignment; - bool bPictureTiling; - sal_uInt8 nSpecialEffect; - - bool bAutoSize; - ::rtl::OUString sImageUrl; - sal_Bool Read(SotStorageStream *pS); - - using OCX_Control::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet>& rPropSet); - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - // No Font record - virtual sal_Bool ReadFontData(SvStorageStream* /*pS*/) { return sal_True; } - - static OCX_Control *Create() { return new OCX_Image;} -}; -struct ContainerRecord -{ - ContainerRecord():nTop(0), nLeft(0), nSubStorageId(0), nSubStreamLen(0), nTabPos(0), nTypeIdent(0), bVisible( true ) {} - - ::rtl::OUString cName; - ::rtl::OUString controlTip; - - sal_uInt32 nTop; - sal_uInt32 nLeft; - sal_uInt32 nSubStorageId; - sal_uInt32 nSubStreamLen; - sal_uInt16 nTabPos; - sal_uInt16 nTypeIdent; - bool bVisible; -}; - -typedef std::vector<OCX_Control*>::iterator CtrlIterator; -typedef std::vector<OCX_Control*>::const_iterator CtrlIteratorConst; -typedef std::vector<OCX_Control*> CtrlList; - - - -class RBGroup -{ - public: - RBGroup():mRBGroupPos(0){} - RBGroup(sal_uInt16& groupPos ):mRBGroupPos(groupPos){} - sal_Int16 tabPos() const { return mRBGroupPos; } - std::vector<OCX_Control*>::size_type numControls() - { return mpControls.size(); } - std::vector<OCX_Control*>& controls() { return mpControls; } - - void add(OCX_Control* pRB); - private: - sal_uInt16 mRBGroupPos; - std::vector<OCX_Control*> mpControls; -}; - -typedef ::std::hash_map < ::rtl::OUString, RBGroup*, ::rtl::OUStringHash, - ::std::equal_to< ::rtl::OUString > > RBGroupHash; -typedef std::vector<RBGroup*>::iterator GroupIterator; - -class OCX_OptionButton; - -class RBGroupManager -{ -public: - RBGroupManager( String& defaultName ); - ~RBGroupManager(); - - CtrlList insertGroupsIntoControlList( const CtrlList& sourceList ); - void addRadioButton( OCX_OptionButton* pRButton ); -private: - - void addSeperator( std::vector< OCX_Control* >& dest ); - void copyList( std::vector< OCX_Control* >& src, - std::vector< OCX_Control* >& dest, - bool addGroupSeperator ); - - RBGroupHash rbGroups; - String mSDefaultName; - std::vector< RBGroup* > groupList; - sal_uInt16 numRadioButtons; -}; - - - - -class OCX_ContainerControl : public OCX_Control -{ -public: - virtual ~OCX_ContainerControl(); - // sub class will process the control specific information - // e.g frame or userform ( maybe tab, mulipage in the future ) - // Base (this) class will process the container specific information - // e.g. the controls contained by this container - // will - // a) create the controls - // b) read the controls - // c) store these controls in a list for post processing - // e.g. import - // - virtual sal_Bool Read(SvStorageStream *pS); - // No Font record - virtual sal_Bool ReadFontData(SvStorageStream* /*pS*/) { return sal_True; } - - using OCX_Control::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - - SotStorageStreamRef getContainerStream() { return mContainerStream; } - - virtual void ProcessControl( OCX_Control* pControl, SvStorageStream* pS, ContainerRecord& rec ); - bool createFromContainerRecord( const ContainerRecord& record, - OCX_Control*& ); -protected: - // This class not meant to be instantiated - // needs to be subclassed - OCX_ContainerControl( SotStorageRef& parent, - const ::rtl::OUString& storageName, - const ::rtl::OUString& sN, - const com::sun::star::uno::Reference< - com::sun::star::container::XNameContainer > &rParent, - OCX_Control* pParent = NULL ); - rtl::OUString createSubStreamName( const sal_uInt32& subStorageID ); - - RBGroupManager rbGroupMgr; - com::sun::star::uno::Reference< - com::sun::star::container::XNameContainer > mxParent; - std::vector<OCX_Control*> mpControls; - SotStorageRef mContainerStorage; - SotStorageStreamRef mContainerStream; - SotStorageStreamRef mContainedControlsStream; - sal_uInt32 nNoRecords; - sal_uInt32 nTotalLen; - sal_uInt32 containerType; - -private: - OCX_ContainerControl(); // not implemented - OCX_ContainerControl(const OCX_ContainerControl&); // not implemented -}; - - -class OCX_MultiPage : public OCX_ContainerControl -{ -public: - OCX_MultiPage( SotStorageRef& parent, - const ::rtl::OUString& storageName, - const ::rtl::OUString& sN, - const com::sun::star::uno::Reference< - com::sun::star::container::XNameContainer > &rDialog, OCX_Control* pParent = NULL); - virtual ~OCX_MultiPage() - { - delete[] pCaption; - delete[] pIcon; - delete[] pPicture; - } - virtual sal_Bool Read(SvStorageStream *pS); - - using OCX_ContainerControl::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::container::XNameContainer> - &rDialog); - virtual void ProcessControl( OCX_Control* pControl, SvStorageStream* pS, ContainerRecord& rec ); - /*sal_uInt8 for sal_uInt8 Word Struct*/ - sal_uInt16 nIdentifier; - sal_uInt16 nFixedAreaLen; - sal_uInt8 pBlockFlags[4]; - - sal_uInt32 fUnknown1; - - sal_uInt8 fUnknown2:1; - sal_uInt8 fEnabled:1; - sal_uInt8 fLocked:1; - sal_uInt8 fBackStyle:1; - sal_uInt8 fUnknown3:4; - - sal_uInt8 fUnknown4:8; - - sal_uInt8 fUnknown5:7; - sal_uInt8 fWordWrap:1; - - sal_uInt8 fUnknown6:4; - sal_uInt8 fAutoSize:1; - sal_uInt8 fUnknown7:3; - - sal_uInt32 nCaptionLen; - sal_uInt16 nVertPos; - sal_uInt16 nHorzPos; - sal_uInt8 nMousePointer; - sal_uInt32 nBorderColor; - sal_uInt32 fUnknown8; - sal_uInt32 fUnknown9; - sal_uInt8 nKeepScrollBarsVisible; - sal_uInt8 nCycle; - sal_uInt16 nBorderStyle; - sal_uInt16 nSpecialEffect; - sal_uInt16 nPicture; - sal_uInt8 nPictureAlignment; - sal_uInt8 nPictureSizeMode; - bool bPictureTiling; - sal_uInt16 nAccelerator; - sal_uInt16 nIcon; - - char *pCaption; - - sal_uInt32 nScrollWidth; - sal_uInt32 nScrollHeight; - - - sal_uInt8 pIconHeader[20]; - sal_uInt32 nIconLen; - sal_uInt8 *pIcon; - - sal_uInt8 pPictureHeader[20]; - sal_uInt32 nPictureLen; - sal_uInt8 *pPicture; -private: - sal_Int32 mnCurrentPageStep; -}; - - - -class OCX_Page : public OCX_ContainerControl -{ -public: - OCX_Page( SotStorageRef& parentStorage, - const ::rtl::OUString& storageName, - const ::rtl::OUString& sN, - const com::sun::star::uno::Reference< - com::sun::star::container::XNameContainer > &rDialog, OCX_Control* parent = NULL); - virtual ~OCX_Page() - { - delete[] pCaption; - delete[] pIcon; - delete[] pPicture; - } - virtual sal_Bool Read(SvStorageStream *pS); - - using OCX_ContainerControl::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::container::XNameContainer> - &rDialog); -/* virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); -*/ - /*sal_uInt8 for sal_uInt8 Word Struct*/ - sal_uInt16 nIdentifier; - sal_uInt16 nFixedAreaLen; - sal_uInt8 pBlockFlags[4]; - - sal_uInt32 fUnknown1; - - sal_uInt8 fUnknown2:1; - sal_uInt8 fEnabled:1; - sal_uInt8 fLocked:1; - sal_uInt8 fBackStyle:1; - sal_uInt8 fUnknown3:4; - - sal_uInt8 fUnknown4:8; - - sal_uInt8 fUnknown5:7; - sal_uInt8 fWordWrap:1; - - sal_uInt8 fUnknown6:4; - sal_uInt8 fAutoSize:1; - sal_uInt8 fUnknown7:3; - - sal_uInt32 nCaptionLen; - sal_uInt16 nVertPos; - sal_uInt16 nHorzPos; - sal_uInt8 nMousePointer; - sal_uInt32 nBorderColor; - sal_uInt32 fUnknown8; - sal_uInt32 fUnknown9; - sal_uInt8 nKeepScrollBarsVisible; - sal_uInt8 nCycle; - sal_uInt16 nBorderStyle; - sal_uInt16 nSpecialEffect; - sal_uInt16 nPicture; - sal_uInt8 nPictureAlignment; - sal_uInt8 nPictureSizeMode; - bool bPictureTiling; - sal_uInt16 nAccelerator; - sal_uInt16 nIcon; - - char *pCaption; - - sal_uInt32 nScrollWidth; - sal_uInt32 nScrollHeight; - - - sal_uInt8 pIconHeader[20]; - sal_uInt32 nIconLen; - sal_uInt8 *pIcon; - - sal_uInt8 pPictureHeader[20]; - sal_uInt32 nPictureLen; - sal_uInt8 *pPicture; -private: -}; - - -class OCX_Frame : public OCX_ContainerControl -{ -public: - OCX_Frame( SotStorageRef& parent, - const ::rtl::OUString& storageName, - const ::rtl::OUString& sN, - const com::sun::star::uno::Reference< - com::sun::star::container::XNameContainer > &rDialog, OCX_Control* pParent = NULL); - virtual ~OCX_Frame() - { - delete[] pCaption; - delete[] pIcon; - delete[] pPicture; - } - virtual sal_Bool Read(SvStorageStream *pS); - - using OCX_ContainerControl::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - - /*sal_uInt8 for sal_uInt8 Word Struct*/ - sal_uInt16 nIdentifier; - sal_uInt16 nFixedAreaLen; - sal_uInt8 pBlockFlags[4]; - - sal_uInt32 fUnknown1; - - sal_uInt8 fUnknown2:1; - sal_uInt8 fEnabled:1; - sal_uInt8 fLocked:1; - sal_uInt8 fBackStyle:1; - sal_uInt8 fUnknown3:4; - - sal_uInt8 fUnknown4:8; - - sal_uInt8 fUnknown5:7; - sal_uInt8 fWordWrap:1; - - sal_uInt8 fUnknown6:4; - sal_uInt8 fAutoSize:1; - sal_uInt8 fUnknown7:3; - - sal_uInt32 nCaptionLen; - sal_uInt16 nVertPos; - sal_uInt16 nHorzPos; - sal_uInt8 nMousePointer; - sal_uInt32 nBorderColor; - sal_uInt32 fUnknown8; - sal_uInt32 fUnknown9; - sal_uInt8 nKeepScrollBarsVisible; - sal_uInt8 nCycle; - sal_uInt16 nBorderStyle; - sal_uInt16 nSpecialEffect; - sal_uInt16 nPicture; - sal_uInt8 nPictureAlignment; - sal_uInt8 nPictureSizeMode; - bool bPictureTiling; - sal_uInt16 nAccelerator; - sal_uInt16 nIcon; - - char *pCaption; - - sal_uInt32 nScrollWidth; - sal_uInt32 nScrollHeight; - sal_uInt32 nScrollLeft; - sal_uInt32 nScrollTop; - - - sal_uInt8 pIconHeader[20]; - sal_uInt32 nIconLen; - sal_uInt8 *pIcon; - - sal_uInt8 pPictureHeader[20]; - sal_uInt32 nPictureLen; - sal_uInt8 *pPicture; -private: -}; - -class OCX_UserForm : public OCX_ContainerControl -{ -public: - OCX_UserForm( SotStorageRef& parent, - const ::rtl::OUString& storageName, - const ::rtl::OUString& sN, - const com::sun::star::uno::Reference< - com::sun::star::container::XNameContainer > &rDialog, - const com::sun::star::uno::Reference< - com::sun::star::lang::XMultiServiceFactory >& rMsf); - ~OCX_UserForm() - { - delete[] pCaption; - delete[] pIcon; - delete[] pPicture; - } - - virtual sal_Bool Read(SvStorageStream *pS); - - using OCX_ContainerControl::Import; // to not hide the other two import methods - virtual sal_Bool Import( com::sun::star::uno::Reference< - com::sun::star::container::XNameContainer> - &rDialog); - - /*sal_uInt8 for sal_uInt8 Word Struct*/ - sal_uInt16 nIdentifier; - sal_uInt16 nFixedAreaLen; - sal_uInt8 pBlockFlags[4]; - - sal_uInt32 nChildrenA; - - sal_uInt8 fUnknown1:1; - sal_uInt8 fEnabled:1; - sal_uInt8 fLocked:1; - sal_uInt8 fBackStyle:1; - sal_uInt8 fUnknown2:4; - - sal_uInt8 fUnknown3:8; - - sal_uInt8 fUnknown4:7; - sal_uInt8 fWordWrap:1; - - sal_uInt8 fUnknown5:4; - sal_uInt8 fAutoSize:1; - sal_uInt8 fUnknown6:3; - - sal_uInt32 nCaptionLen; - sal_uInt16 nVertPos; - sal_uInt16 nHorzPos; - sal_uInt8 nMousePointer; - sal_uInt32 nBorderColor; - sal_uInt32 nDrawBuffer; - sal_uInt32 nChildrenB; - sal_uInt8 nKeepScrollBarsVisible; - sal_uInt8 nCycle; - sal_uInt16 nBorderStyle; - sal_uInt8 nSpecialEffect; - sal_uInt16 nPicture; - sal_uInt8 nPictureAlignment; - sal_uInt8 nPictureSizeMode; - bool bPictureTiling; - sal_uInt16 nAccelerator; - sal_uInt16 nIcon; - sal_uInt16 fUnknown7; - - char *pCaption; - - sal_uInt32 nScrollWidth; - sal_uInt32 nScrollHeight; - sal_uInt32 nScrollLeft; - sal_uInt32 nScrollTop; - - sal_uInt8 pIconHeader[20]; - sal_uInt32 nIconLen; - sal_uInt8 *pIcon; - - sal_uInt8 pPictureHeader[20]; - sal_uInt32 nPictureLen; - sal_uInt8 *pPicture; -private: - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext> mxCtx; -}; - - - -class OCX_CheckBox : public OCX_ModernControl -{ -public: - OCX_CheckBox() : OCX_ModernControl(rtl::OUString::createFromAscii("CheckBox")){ - msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CheckBox"); - msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlCheckBoxModel"); - mnBackColor = 0x80000005L; - mnForeColor = 0x80000008L; - aFontData.SetHasAlign(TRUE); - } - - using OCX_ModernControl::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - static OCX_Control *Create() { return new OCX_CheckBox;} -}; - -class OCX_OptionButton : public OCX_ModernControl -{ -public: - OCX_OptionButton() : OCX_ModernControl(rtl::OUString::createFromAscii("OptionButton")) - { - msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton"); - msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel"); - mnBackColor = 0x80000005L; - mnForeColor = 0x80000008L; - aFontData.SetHasAlign(TRUE); - } - - using OCX_ModernControl::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - - - static OCX_Control *Create() { return new OCX_OptionButton;} -}; - -class OCX_TextBox : public OCX_ModernControl -{ -public: - OCX_TextBox() : OCX_ModernControl(rtl::OUString::createFromAscii("TextBox")) { - msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.TextField"); - msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlEditModel"); - mnBackColor = 0x80000005L; - mnForeColor = 0x80000008L; - nBorderColor = 0x80000006L; - aFontData.SetHasAlign(TRUE); - } - - using OCX_ModernControl::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - static OCX_Control *Create() { return new OCX_TextBox;} -}; - -class OCX_FieldControl: public OCX_ModernControl -{ -public: - OCX_FieldControl() : OCX_ModernControl(rtl::OUString::createFromAscii("TextBox")) { - mnBackColor = 0x80000005L; - mnForeColor = 0x80000008L; - nBorderColor = 0x80000006L; - } - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - static OCX_Control *Create() { return new OCX_FieldControl;} -}; - - -class OCX_ToggleButton : public OCX_ModernControl -{ -public: - OCX_ToggleButton() : OCX_ModernControl(rtl::OUString::createFromAscii("ToggleButton")) { - msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CommandButton"); - msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlButtonModel"); - - mnBackColor = 0x8000000F; - mnForeColor = 0x80000012; - aFontData.SetHasAlign(TRUE); - aFontData.nJustification = 3; // centered by default - } - static OCX_Control *Create() { return new OCX_ToggleButton;} - - using OCX_ModernControl::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - sal_Bool Export(SvStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SvStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); -}; - -class OCX_ComboBox : public OCX_ModernControl -{ -public: - OCX_ComboBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ComboBox")){ - msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox"); - msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlComboBoxModel"); - mnBackColor = 0x80000005; - mnForeColor = 0x80000008; - nBorderColor = 0x80000006; - aFontData.SetHasAlign(TRUE); - } - static OCX_Control *Create() { return new OCX_ComboBox;} - using OCX_ModernControl::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); -}; - -class OCX_ListBox : public OCX_ModernControl -{ -public: - OCX_ListBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ListBox")){ - msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox"); - msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel"); - mnBackColor = 0x80000005; - mnForeColor = 0x80000008; - nBorderColor = 0x80000006; - aFontData.SetHasAlign(TRUE); - } - static OCX_Control *Create() { return new OCX_ListBox;} - using OCX_ModernControl::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - -}; - -class OCX_CommandButton : public OCX_Control -{ -public: - OCX_CommandButton() : OCX_Control(String::CreateFromAscii("CommandButton")), - fEnabled(1), fLocked(0), fBackStyle(1), fWordWrap(0), fAutoSize(0), - nCaptionLen(0), nVertPos(1), nHorzPos(7), nMousePointer(0), nPicture(0), - nAccelerator(0), nIcon(0), pCaption(0), nIconLen(0), pIcon(0), nPictureLen(0), - pPicture(0), mbTakeFocus( true ) - { - msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CommandButton"); - msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlButtonModel"); - mnForeColor = 0x80000012L; - mnBackColor = 0x8000000FL; - } - - ~OCX_CommandButton() { - if (pCaption) delete[] pCaption; - if (pIcon) delete[] pIcon; - if (pPicture) delete[] pPicture; - } - sal_Bool Read(SotStorageStream *pS); - - /*sal_uInt8 for sal_uInt8 Word Struct*/ - sal_uInt16 nIdentifier; - sal_uInt16 nFixedAreaLen; - sal_uInt8 pBlockFlags[4]; - - - sal_uInt8 fUnknown1:1; - sal_uInt8 fEnabled:1; - sal_uInt8 fLocked:1; - sal_uInt8 fBackStyle:1; - sal_uInt8 fUnknown2:4; - - sal_uInt8 fUnknown3:8; - - sal_uInt8 fUnknown4:7; - sal_uInt8 fWordWrap:1; - - sal_uInt8 fUnknown5:4; - sal_uInt8 fAutoSize:1; - sal_uInt8 fUnknown6:3; - - sal_uInt32 nCaptionLen; - - sal_uInt16 nVertPos; - sal_uInt16 nHorzPos; - - sal_uInt16 nMousePointer; - sal_uInt16 nPicture; - sal_uInt16 nAccelerator; - sal_uInt16 nIcon; - - char *pCaption; - - sal_uInt8 pIconHeader[20]; - sal_uInt32 nIconLen; - sal_uInt8 *pIcon; - - sal_uInt8 pPictureHeader[20]; - sal_uInt32 nPictureLen; - sal_uInt8 *pPicture; - - bool mbTakeFocus; - - static OCX_Control *Create() { return new OCX_CommandButton;} - using OCX_Control::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - -}; - -class OCX_ImageButton: public OCX_CommandButton -{ -public: - OCX_ImageButton() { - aFontData.SetHasAlign(FALSE); - aFontData.SetHasFont(FALSE); - } - static OCX_Control *Create() { return new OCX_ImageButton;} - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - -}; - -class OCX_GroupBox: public OCX_Control -{ -public: - OCX_GroupBox() : OCX_Control(String::CreateFromAscii("GroupBox")) {} - static OCX_Control *Create() { return new OCX_GroupBox;} - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - -}; - -class OCX_Label : public OCX_Control -{ -public: - OCX_Label(OCX_Control* pParent = NULL ) : OCX_Control(rtl::OUString::createFromAscii("Label"), pParent ), fEnabled(1), - fLocked(0),fBackStyle(1),fWordWrap(1), - fAutoSize(0),nCaptionLen(0),nVertPos(1),nHorzPos(7),nMousePointer(0), - nBorderColor(0x80000006),nBorderStyle(0),nSpecialEffect(0), - nPicture(0),nAccelerator(0),nIcon(0),pCaption(0),nIconLen(0),pIcon(0), - nPictureLen(0),pPicture(0) - { - msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.FixedText"); - msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedTextModel"); - mnForeColor = 0x80000008; - mnBackColor = 0x80000005; - aFontData.SetHasAlign(TRUE); - } - - ~OCX_Label() { - if (pCaption) delete[] pCaption; - if (pIcon) delete[] pIcon; - if (pPicture) delete[] pPicture; - } - sal_Bool Read(SotStorageStream *pS); - - /*sal_uInt8 for sal_uInt8 Word Struct*/ - sal_uInt16 nIdentifier; - sal_uInt16 nFixedAreaLen; - sal_uInt8 pBlockFlags[4]; - - - sal_uInt8 fUnknown1:1; - sal_uInt8 fEnabled:1; - sal_uInt8 fLocked:1; - sal_uInt8 fBackStyle:1; - sal_uInt8 fUnknown2:4; - - sal_uInt8 fUnknown3:8; - - sal_uInt8 fUnknown4:7; - sal_uInt8 fWordWrap:1; - - sal_uInt8 fUnknown5:4; - sal_uInt8 fAutoSize:1; - sal_uInt8 fUnknown6:3; - - sal_uInt32 nCaptionLen; - sal_uInt16 nVertPos; - sal_uInt16 nHorzPos; - sal_uInt8 nMousePointer; - sal_uInt32 nBorderColor; - sal_uInt16 nBorderStyle; - sal_uInt16 nSpecialEffect; - sal_uInt16 nPicture; - sal_uInt16 nAccelerator; - sal_uInt16 nIcon; - - char *pCaption; - - sal_uInt8 pIconHeader[20]; - sal_uInt32 nIconLen; - sal_uInt8 *pIcon; - - sal_uInt8 pPictureHeader[20]; - sal_uInt32 nPictureLen; - sal_uInt8 *pPicture; - - static OCX_Control *Create() { return new OCX_Label;} - - using OCX_Control::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - - sal_Bool Export(SotStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - sal_Bool WriteContents(SotStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize); - -}; - - -class OCX_ProgressBar : public OCX_Control -{ -public: - explicit OCX_ProgressBar(); - - static OCX_Control* Create(); - - virtual sal_Bool Read( SvStorageStream *pS ); - using OCX_Control::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - // No Font record - virtual sal_Bool ReadFontData(SvStorageStream* /*pS*/) { return sal_True; } -private: - sal_Int32 nMin; - sal_Int32 nMax; - bool bFixedSingle; - bool bEnabled; - bool b3d; -}; - -class OCX_SpinButton : public OCX_Control -{ -public: - explicit OCX_SpinButton(); - - static OCX_Control* Create(); - - virtual sal_Bool Read( SvStorageStream *pS ); - - virtual sal_Bool ReadFontData( SvStorageStream *pS ); - - using OCX_Control::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - //Export exports a control as an OLE style storage stream tree - virtual sal_Bool Export( SvStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize ); - - //WriteContents writes the contents of a contents stream, for - //the Excel export you cannot use Export, only WriteContents instead - virtual sal_Bool WriteContents( SvStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize ); - -protected: - void UpdateInt32Property( - sal_Int32& rnCoreValue, sal_Int32 nNewValue, - sal_Int32 nBlockFlag ); - - void GetInt32Property( - sal_Int32& rnCoreValue, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet >& rxPropSet, - const rtl::OUString& rPropName, - sal_Int32 nBlockFlag ); - - void UpdateBoolProperty( - bool& rbCoreValue, bool bNewValue, - sal_Int32 nBlockFlag ); - - void GetBoolProperty( - bool& rbCoreValue, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet >& rxPropSet, - const rtl::OUString& rPropName, - sal_Int32 nBlockFlag ); - - /** Writes the data from own members to stream. */ - sal_Bool WriteData( SvStream& rStrm ) const; - - sal_Int32 mnBlockFlags; - sal_Int32 mnValue; - sal_Int32 mnMin; - sal_Int32 mnMax; - sal_Int32 mnSmallStep; - sal_Int32 mnPageStep; - sal_Int32 mnOrient; - sal_Int32 mnDelay; - bool mbEnabled; - bool mbLocked; - bool mbPropThumb; -}; - -class OCX_ScrollBar : public OCX_SpinButton -{ -public: - explicit OCX_ScrollBar(); - - static OCX_Control* Create(); - - using OCX_Control::Import; // to not hide the other two import methods - virtual sal_Bool Import(com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet); - - //Export exports a control as an OLE style storage stream tree - virtual sal_Bool Export( SvStorageRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize ); - - //WriteContents writes the contents of a contents stream, for - //the Excel export you cannot use Export, only WriteContents instead - virtual sal_Bool WriteContents( SvStorageStreamRef &rObj, - const com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet> &rPropSet, - const com::sun::star::awt::Size& rSize ); -}; - -#endif diff --git a/svx/inc/svx/msvbahelper.hxx b/svx/inc/svx/msvbahelper.hxx deleted file mode 100644 index 294f26e6fc..0000000000 --- a/svx/inc/svx/msvbahelper.hxx +++ /dev/null @@ -1,58 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: - * $Revision: - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _MSVBAHELPER_HXX -#define _MSVBAHELPER_HXX - -#include <sfx2/objsh.hxx> -#include "svx/svxdllapi.h" - -namespace ooo { namespace vba -{ - class SVX_DLLPUBLIC VBAMacroResolvedInfo - { - SfxObjectShell* mpDocContext; - bool mbFound; - String msResolvedMacro; - public: - VBAMacroResolvedInfo() : mpDocContext(NULL), mbFound( false ){} - void SetResolved( bool bRes ) { mbFound = bRes; } - bool IsResolved() { return mbFound; } - void SetMacroDocContext(SfxObjectShell* pShell ) { mpDocContext = pShell; } - SfxObjectShell* MacroDocContext() { return mpDocContext; } - String ResolvedMacro() { return msResolvedMacro; } - void SetResolvedMacro(const String& sMacro ) { msResolvedMacro = sMacro; } - }; - - SVX_DLLPUBLIC String makeMacroURL( const String& sMacroName ); - SVX_DLLPUBLIC VBAMacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, const rtl::OUString& sMod, bool bSearchGlobalTemplates = false ); - SVX_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const String& 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 ); -} } - -#endif diff --git a/svx/inc/svx/nhypitem.hxx b/svx/inc/svx/nhypitem.hxx index 73eeb648e9..6d97d9cab8 100644 --- a/svx/inc/svx/nhypitem.hxx +++ b/svx/inc/svx/nhypitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/numfmtsh.hxx b/svx/inc/svx/numfmtsh.hxx index 87eeb33d66..75f253487b 100644 --- a/svx/inc/svx/numfmtsh.hxx +++ b/svx/inc/svx/numfmtsh.hxx @@ -46,7 +46,7 @@ #endif #include "svx/svxdllapi.h" -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> // forward --------------------------------------------------------------- diff --git a/svx/inc/svx/numinf.hxx b/svx/inc/svx/numinf.hxx index af53769190..81a1972f23 100644 --- a/svx/inc/svx/numinf.hxx +++ b/svx/inc/svx/numinf.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/numfmtsh.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx index c7138df5f2..89be46dea9 100644 --- a/svx/inc/svx/numitem.hxx +++ b/svx/inc/svx/numitem.hxx @@ -34,7 +34,7 @@ #include <tools/link.hxx> #include <tools/string.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/svxenum.hxx> #include <tools/gen.hxx> #ifndef _SVX_NUMDEF_HXX //autogen @@ -47,7 +47,7 @@ #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/style/NumberingType.hpp> -#include <vcl/fontcvt.hxx> +#include <unotools/fontcvt.hxx> #include "svx/svxdllapi.h" class SvxBrushItem; diff --git a/svx/inc/svx/obj3d.hxx b/svx/inc/svx/obj3d.hxx index 229d8bcf19..7a6e48a909 100644 --- a/svx/inc/svx/obj3d.hxx +++ b/svx/inc/svx/obj3d.hxx @@ -40,7 +40,7 @@ #include <vcl/bitmap.hxx> #include <svx/svx3ditems.hxx> #include <svx/xflclit.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/inc/svx/optimprove.hxx b/svx/inc/svx/optimprove.hxx deleted file mode 100644 index 61f184239e..0000000000 --- a/svx/inc/svx/optimprove.hxx +++ /dev/null @@ -1,143 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: optimprove.hxx,v $ - * $Revision: 1.2 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_OPTIMPROVE_HXX -#define _SVX_OPTIMPROVE_HXX - -// include --------------------------------------------------------------- - -#include "svx/svxdllapi.h" - -#include <vcl/tabpage.hxx> -#include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <svtools/fixedhyper.hxx> -#include <sfx2/basedlgs.hxx> -#include <sfx2/tabdlg.hxx> - -// class SvxEmptyPage ---------------------------------------------------- - -class SvxEmptyPage : public TabPage -{ -public: - SvxEmptyPage( Window* pParent ); -}; - -// class SvxImprovementPage ---------------------------------------------- - -class SvxImprovementPage : public TabPage -{ -private: - FixedLine m_aImproveFL; - FixedText m_aInvitationFT; - RadioButton m_aYesRB; - RadioButton m_aNoRB; - FixedLine m_aDataFL; - FixedText m_aNumberOfReportsFT; - FixedText m_aNumberOfReportsValueFT; - FixedText m_aNumberOfActionsFT; - FixedText m_aNumberOfActionsValueFT; - PushButton m_aShowDataPB; - - String m_sInfo; - String m_sMoreInfo; - -public: - SvxImprovementPage( Window* pParent ); - ~SvxImprovementPage(); - - inline bool IsYesChecked() const { return m_aYesRB.IsChecked() != FALSE; } - - inline String GetPageText() const { return GetText(); } - inline String GetInvitationText() const { return m_aInvitationFT.GetText(); } - inline String GetYesButtonText() const { return m_aYesRB.GetText(); } - inline String GetNoButtonText() const { return m_aNoRB.GetText(); } - inline String GetInfoText() const { return m_sInfo; } - inline String GetTitleText() const { return m_aImproveFL.GetText(); } -}; - -class SvxImprovementOptionsPage : public SfxTabPage -{ -private: - FixedLine m_aImproveFL; - FixedText m_aInvitationFT; - RadioButton m_aYesRB; - RadioButton m_aNoRB; - svt::FixedHyperlinkImage m_aInfoFI; - FixedLine m_aDataFL; - FixedText m_aNumberOfReportsFT; - FixedText m_aNumberOfReportsValueFT; - FixedText m_aNumberOfActionsFT; - FixedText m_aNumberOfActionsValueFT; - PushButton m_aShowDataPB; - - String m_sInfo; - String m_sMoreInfo; - ::rtl::OUString m_sLogPath; - - SvxImprovementOptionsPage( Window* pParent, const SfxItemSet& rSet ); - - DECL_LINK( HandleHyperlink, svt::FixedHyperlinkImage * ); - DECL_LINK( HandleShowData, PushButton * ); - -public: - virtual ~SvxImprovementOptionsPage(); - - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static sal_uInt16* GetRanges(); - - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); -}; - -class SvxImprovementDialog : public SfxSingleTabDialog -{ -private: - SvxImprovementPage* m_pPage; - - DECL_LINK( HandleOK, OKButton * ); - DECL_LINK( HandleHyperlink, svt::FixedHyperlinkImage * ); - -public: - SvxImprovementDialog( Window* pParent, const String& rInfoURL ); -}; - -class SvxInfoWindow : public Window -{ -private: - FixedText m_aInfoText; - -public: - SvxInfoWindow( Window* pParent, const ResId& rResId ); - - void SetInfoText( const String& rText ); -}; - -#endif - diff --git a/svx/inc/svx/optlingu.hxx b/svx/inc/svx/optlingu.hxx deleted file mode 100644 index eee2e3d644..0000000000 --- a/svx/inc/svx/optlingu.hxx +++ /dev/null @@ -1,185 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: optlingu.hxx,v $ - * $Revision: 1.4 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_OPTLINGU_HXX -#define _SVX_OPTLINGU_HXX - -// include --------------------------------------------------------------- - -#include <vcl/group.hxx> -#include <vcl/fixed.hxx> -#include <vcl/toolbox.hxx> -#include <vcl/field.hxx> -#include <svtools/fixedhyper.hxx> -#include <sfx2/tabdlg.hxx> -#include <svx/checklbx.hxx> -#include <svx/langbox.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include "svx/svxdllapi.h" - -namespace com{namespace sun{namespace star{ -namespace beans{ - class XPropertySet; -} -namespace linguistic2{ - class XDictionary; - class XDictionaryList; - class XSpellChecker; -}}}} - -class SvLBoxEntry; -class SvxLinguData_Impl; - -// define ---------------------------------------------------------------- - -#define GROUP_MODULES ((sal_uInt16)0x0008) - -// forward --------------------------------------------------------------- - -class SvxEditModulesDlg : public ModalDialog -{ - FixedLine aModulesFL; - FixedText aLanguageFT; - SvxLanguageBox aLanguageLB; - - SvxCheckListBox aModulesCLB; - PushButton aPrioUpPB; - PushButton aPrioDownPB; - PushButton aBackPB; - svt::FixedHyperlink aMoreDictsLink; - - FixedLine aButtonsFL; - HelpButton aHelpPB; - OKButton aClosePB; - - String sSpell; - String sHyph; - String sThes; - String sGrammar; - - SvxLinguData_Impl* pDefaultLinguData; - SvxLinguData_Impl& rLinguData; - - SvLBoxButtonData* pCheckButtonData; - - SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); - -#ifdef _SVX_OPTLINGU_CXX - DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); - DECL_LINK( UpDownHdl_Impl, PushButton * ); - DECL_LINK( ClickHdl_Impl, PushButton * ); - DECL_LINK( BackHdl_Impl, PushButton * ); - DECL_LINK( SelectHdlLB_Impl, ListBox * ); - DECL_LINK( LangSelectHdl_Impl, ListBox* ); - DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); - DECL_LINK( OpenURLHdl_Impl, svt::FixedHyperlink* ); -#endif - -public: - SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData); - virtual ~SvxEditModulesDlg(); -}; - -// class SvxLinguTabPage ------------------------------------------------- - -class SVX_DLLPUBLIC SvxLinguTabPage : public SfxTabPage -{ -private: - FixedLine aLinguisticFL; - FixedText aLinguModulesFT; - SvxCheckListBox aLinguModulesCLB; - PushButton aLinguModulesEditPB; - FixedText aLinguDicsFT; - SvxCheckListBox aLinguDicsCLB; - PushButton aLinguDicsNewPB; - PushButton aLinguDicsEditPB; - PushButton aLinguDicsDelPB; - FixedText aLinguOptionsFT; - SvxCheckListBox aLinguOptionsCLB; - PushButton aLinguOptionsEditPB; - svt::FixedHyperlink aMoreDictsLink; - - String sCapitalWords; - String sWordsWithDigits; - String sCapitalization; - String sSpellSpecial; - String sSpellAuto; - String sGrammarAuto; - String sNumMinWordlen; - String sNumPreBreak; - String sNumPostBreak; - String sHyphAuto; - String sHyphSpecial; - - com::sun::star::uno::Reference< - com::sun::star::beans::XPropertySet > xProp; - - com::sun::star::uno::Reference< - com::sun::star::linguistic2::XDictionaryList > xDicList; - com::sun::star::uno::Sequence< - com::sun::star::uno::Reference< - com::sun::star::linguistic2::XDictionary > > aDics; - - SvLBoxButtonData* pCheckButtonData; - - SvxLinguData_Impl* pLinguData; - - SVX_DLLPRIVATE SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet ); - SVX_DLLPRIVATE SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol); - - SVX_DLLPRIVATE void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); - SVX_DLLPRIVATE ULONG GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx ); - -#ifdef _SVX_OPTLINGU_CXX - DECL_LINK( SelectHdl_Impl, SvxCheckListBox * ); - DECL_LINK( ClickHdl_Impl, PushButton * ); - DECL_LINK( BoxDoubleClickHdl_Impl, SvTreeListBox * ); - DECL_LINK( BoxCheckButtonHdl_Impl, SvTreeListBox * ); - DECL_LINK( PostDblClickHdl_Impl, SvTreeListBox * ); - DECL_LINK( OpenURLHdl_Impl, svt::FixedHyperlink* ); - - SVX_DLLPRIVATE void UpdateModulesBox_Impl(); - SVX_DLLPRIVATE void UpdateDicBox_Impl(); -#endif - -public: - virtual ~SvxLinguTabPage(); - static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); - static sal_uInt16* GetRanges(); - - virtual sal_Bool FillItemSet( SfxItemSet& rSet ); - virtual void Reset( const SfxItemSet& rSet ); - - void HideGroups( sal_uInt16 nGrp ); -}; - -#endif - diff --git a/svx/inc/svx/orphitem.hxx b/svx/inc/svx/orphitem.hxx index 2cf00190af..b3a284f068 100644 --- a/svx/inc/svx/orphitem.hxx +++ b/svx/inc/svx/orphitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/outliner.hxx b/svx/inc/svx/outliner.hxx index 6453898898..b93f930529 100644 --- a/svx/inc/svx/outliner.hxx +++ b/svx/inc/svx/outliner.hxx @@ -34,7 +34,7 @@ #include <tools/string.hxx> #include <tools/debug.hxx> -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <svx/editdata.hxx> #include <i18npool/lang.h> diff --git a/svx/inc/svx/pageitem.hxx b/svx/inc/svx/pageitem.hxx index 79f9f6443d..6c84d71aac 100644 --- a/svx/inc/svx/pageitem.hxx +++ b/svx/inc/svx/pageitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/string.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/paravertalignitem.hxx b/svx/inc/svx/paravertalignitem.hxx index 394c440a12..a8455819e2 100644 --- a/svx/inc/svx/paravertalignitem.hxx +++ b/svx/inc/svx/paravertalignitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/pbinitem.hxx b/svx/inc/svx/pbinitem.hxx index 95ad1193f6..f9b1caa8da 100644 --- a/svx/inc/svx/pbinitem.hxx +++ b/svx/inc/svx/pbinitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/pmdlitem.hxx b/svx/inc/svx/pmdlitem.hxx index c86064a30d..b05cf29646 100644 --- a/svx/inc/svx/pmdlitem.hxx +++ b/svx/inc/svx/pmdlitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/postitem.hxx b/svx/inc/svx/postitem.hxx index a259c16848..d5ccefd748 100644 --- a/svx/inc/svx/postitem.hxx +++ b/svx/inc/svx/postitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/vclenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/prszitem.hxx b/svx/inc/svx/prszitem.hxx index ff46ab5937..6e6acff2a9 100644 --- a/svx/inc/svx/prszitem.hxx +++ b/svx/inc/svx/prszitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/ruler.hxx b/svx/inc/svx/ruler.hxx index 58aef4c972..b58839bdeb 100644 --- a/svx/inc/svx/ruler.hxx +++ b/svx/inc/svx/ruler.hxx @@ -32,7 +32,7 @@ #include <vcl/menu.hxx> #include <svtools/ruler.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include "svx/svxdllapi.h" class SvxProtectItem; diff --git a/svx/inc/svx/scriptspaceitem.hxx b/svx/inc/svx/scriptspaceitem.hxx index d153c7b27f..a6966ed089 100644 --- a/svx/inc/svx/scriptspaceitem.hxx +++ b/svx/inc/svx/scriptspaceitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/scripttypeitem.hxx b/svx/inc/svx/scripttypeitem.hxx index 7850623dec..58c7f8a943 100644 --- a/svx/inc/svx/scripttypeitem.hxx +++ b/svx/inc/svx/scripttypeitem.hxx @@ -32,11 +32,11 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include "svx/svxdllapi.h" // class SvxScriptTypeItem ---------------------------------------------- diff --git a/svx/inc/svx/sdangitm.hxx b/svx/inc/svx/sdangitm.hxx index cecea4f7b1..7571b8ffe8 100644 --- a/svx/inc/svx/sdangitm.hxx +++ b/svx/inc/svx/sdangitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDANGITM_HXX #define _SDANGITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdasaitm.hxx b/svx/inc/svx/sdasaitm.hxx index 163172c1da..fa8105da68 100644 --- a/svx/inc/svx/sdasaitm.hxx +++ b/svx/inc/svx/sdasaitm.hxx @@ -31,7 +31,7 @@ #ifndef _SDASAITM_HXX #define _SDASAITM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/list.hxx> class SdrCustomShapeAdjustmentValue diff --git a/svx/inc/svx/sdasitm.hxx b/svx/inc/svx/sdasitm.hxx index a98dc7a0e2..f678492366 100644 --- a/svx/inc/svx/sdasitm.hxx +++ b/svx/inc/svx/sdasitm.hxx @@ -33,7 +33,7 @@ #include <svx/svddef.hxx> #include <svx/sdooitm.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Any.hxx> diff --git a/svx/inc/svx/sdggaitm.hxx b/svx/inc/svx/sdggaitm.hxx index 9327fe343b..4a46bdc53a 100644 --- a/svx/inc/svx/sdggaitm.hxx +++ b/svx/inc/svx/sdggaitm.hxx @@ -31,7 +31,7 @@ #ifndef _SDGGAITM_HXX #define _SDGGAITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdgmoitm.hxx b/svx/inc/svx/sdgmoitm.hxx index dbe6a946af..680d828849 100644 --- a/svx/inc/svx/sdgmoitm.hxx +++ b/svx/inc/svx/sdgmoitm.hxx @@ -32,7 +32,7 @@ #define _SDGMOITM_HXX #include <goodies/grfmgr.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdmetitm.hxx b/svx/inc/svx/sdmetitm.hxx index e4d74645e6..5d6886d9e7 100644 --- a/svx/inc/svx/sdmetitm.hxx +++ b/svx/inc/svx/sdmetitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDMETITM_HXX #define _SDMETITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdooitm.hxx b/svx/inc/svx/sdooitm.hxx index 599f12f6ad..ed78dc85d2 100644 --- a/svx/inc/svx/sdooitm.hxx +++ b/svx/inc/svx/sdooitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDOOITM_HXX #define _SDOOITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdprcitm.hxx b/svx/inc/svx/sdprcitm.hxx index b0bf892e4a..cd96f03ca0 100644 --- a/svx/inc/svx/sdprcitm.hxx +++ b/svx/inc/svx/sdprcitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDPRCITM_HXX #define _SDPRCITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdr/properties/attributeproperties.hxx b/svx/inc/svx/sdr/properties/attributeproperties.hxx index 701dcaf728..b04fee0384 100644 --- a/svx/inc/svx/sdr/properties/attributeproperties.hxx +++ b/svx/inc/svx/sdr/properties/attributeproperties.hxx @@ -31,7 +31,7 @@ #ifndef _SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX #define _SDR_PROPERTIES_ATTRIBUTEPROPERTIES_HXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/sdr/properties/defaultproperties.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdrpagewindow.hxx b/svx/inc/svx/sdrpagewindow.hxx index a1874fad6a..2a37c9161f 100644 --- a/svx/inc/svx/sdrpagewindow.hxx +++ b/svx/inc/svx/sdrpagewindow.hxx @@ -38,7 +38,7 @@ #include <com/sun/star/util/XModeChangeListener.hpp> #include <cppuhelper/implbase4.hxx> #include <svx/svdtypes.hxx> // fuer SdrLayerID -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/contnr.hxx> #include <svx/sdrpagewindow.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtaaitm.hxx b/svx/inc/svx/sdtaaitm.hxx index 70de9aeb57..2b5e7df3a1 100644 --- a/svx/inc/svx/sdtaaitm.hxx +++ b/svx/inc/svx/sdtaaitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTAAITM_HXX #define _SDTAAITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtacitm.hxx b/svx/inc/svx/sdtacitm.hxx index bf00ce12fb..2704f946f5 100644 --- a/svx/inc/svx/sdtacitm.hxx +++ b/svx/inc/svx/sdtacitm.hxx @@ -30,7 +30,7 @@ #ifndef sdtacitm_hxx #define sdtacitm_hxx -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svddef.hxx> // Anzahl der Durchlaeufe. 0=Endlos. diff --git a/svx/inc/svx/sdtaditm.hxx b/svx/inc/svx/sdtaditm.hxx index 72e17855b5..5d1a69e986 100644 --- a/svx/inc/svx/sdtaditm.hxx +++ b/svx/inc/svx/sdtaditm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTADITM_HXX #define _SDTADITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtaitm.hxx b/svx/inc/svx/sdtaitm.hxx index eaac7692a2..81e9554149 100644 --- a/svx/inc/svx/sdtaitm.hxx +++ b/svx/inc/svx/sdtaitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTAITM_HXX #define _SDTAITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtakitm.hxx b/svx/inc/svx/sdtakitm.hxx index 165d62c1b6..5874c830d2 100644 --- a/svx/inc/svx/sdtakitm.hxx +++ b/svx/inc/svx/sdtakitm.hxx @@ -30,7 +30,7 @@ #ifndef SDTAKITM_HXX #define SDTAKITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtayitm.hxx b/svx/inc/svx/sdtayitm.hxx index b7517ef973..70dc5dc54f 100644 --- a/svx/inc/svx/sdtayitm.hxx +++ b/svx/inc/svx/sdtayitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTAYITM_HXX #define _SDTAYITM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdtfsitm.hxx b/svx/inc/svx/sdtfsitm.hxx index e5ee89aa12..d37e006d62 100644 --- a/svx/inc/svx/sdtfsitm.hxx +++ b/svx/inc/svx/sdtfsitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDTFSITM_HXX #define _SDTFSITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sdynitm.hxx b/svx/inc/svx/sdynitm.hxx index 81c3e08c23..aa2f4bdcb2 100644 --- a/svx/inc/svx/sdynitm.hxx +++ b/svx/inc/svx/sdynitm.hxx @@ -30,7 +30,7 @@ #ifndef _SDYNITM_HXX #define _SDYNITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/shaditem.hxx b/svx/inc/svx/shaditem.hxx index 6160dbeebe..323e4a06fc 100644 --- a/svx/inc/svx/shaditem.hxx +++ b/svx/inc/svx/shaditem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <tools/color.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/shdditem.hxx b/svx/inc/svx/shdditem.hxx index c4fe591783..9f6fa35af3 100644 --- a/svx/inc/svx/shdditem.hxx +++ b/svx/inc/svx/shdditem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/sizeitem.hxx b/svx/inc/svx/sizeitem.hxx index c5ee7b6e74..ca255a6128 100644 --- a/svx/inc/svx/sizeitem.hxx +++ b/svx/inc/svx/sizeitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <tools/gen.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/spltitem.hxx b/svx/inc/svx/spltitem.hxx index 29d0001298..4a12a22dcf 100644 --- a/svx/inc/svx/spltitem.hxx +++ b/svx/inc/svx/spltitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/svdattr.hxx b/svx/inc/svx/svdattr.hxx index 4120f9b103..ea38817559 100644 --- a/svx/inc/svx/svdattr.hxx +++ b/svx/inc/svx/svdattr.hxx @@ -32,7 +32,7 @@ #define _SVDATTR_HXX #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #include <tools/solar.h> #include <svx/sdangitm.hxx> diff --git a/svx/inc/svx/svdfppt.hxx b/svx/inc/svx/svdfppt.hxx deleted file mode 100644 index 048fb5dba8..0000000000 --- a/svx/inc/svx/svdfppt.hxx +++ /dev/null @@ -1,1445 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: svdfppt.hxx,v $ - * $Revision: 1.7.6.1 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SVDFPPT_HXX -#define _SVDFPPT_HXX - -#ifndef SVX_LIGHT - -#include <tools/solar.h> -#include <svtools/svarray.hxx> -#include <tools/string.hxx> -#include <tools/gen.hxx> -#ifndef _SV_COLOR_HXX -#include <tools/color.hxx> -#endif -#include <svx/svdobj.hxx> -#include <svx/numitem.hxx> -#include <svx/editdata.hxx> -#include <svx/msdffimp.hxx> // Escher-Grafikimport -#include <svx/msocximex.hxx> -#include <svx/msfiltertracer.hxx> -#include <svx/eeitem.hxx> -#define ITEMID_FIELD EE_FEATURE_FIELD -#include <svx/flditem.hxx> -#undef ITEMID_FIELD -#include "svx/svxdllapi.h" -#include <vcl/font.hxx> -#include <vector> -#include <boost/optional.hpp> -//////////////////////////////////////////////////////////////////////////////////////////////////// - -class SdrModel; -class SdPage; -class SdrPage; -class SdrObject; -class SvStream; -class Polygon; -class PolyPolygon; -class SfxItemSet; -class Outliner; -class Graphic; -class SvxMSDffManager; -class PptTextMetaCharList; -class PPTTextObj; -class DffRecordHeader; -struct PptCharAttrSet; -class SvxBulletItem; - -#define PPT_IMPORTFLAGS_NO_TEXT_ASSERT 1 - -struct SVX_DLLPUBLIC PptCurrentUserAtom -{ - sal_uInt32 nMagic; - sal_uInt32 nCurrentUserEdit; - sal_uInt16 nDocFileVersion; - sal_uInt8 nMajorVersion; - sal_uInt8 nMinorVersion; - String aCurrentUser; - -public: - - PptCurrentUserAtom() : nMagic ( 0 ), - nCurrentUserEdit ( 0 ), - nDocFileVersion ( 0 ), - nMajorVersion ( 0 ), - nMinorVersion ( 0 ) {} - - SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptCurrentUserAtom& rAtom ); -}; - -struct SVX_DLLPUBLIC PowerPointImportParam -{ - SvStream& rDocStream; - sal_uInt32 nImportFlags; - MSFilterTracer* pTracer; - PptCurrentUserAtom aCurrentUserAtom; - - PowerPointImportParam( SvStream& rDocStream, sal_uInt32 nImportFlags, MSFilterTracer* pTracer ); -}; - -struct SdHyperlinkEntry -{ - sal_uInt32 nIndex; - sal_Int32 nPrivate1; - sal_Int32 nPrivate2; - sal_Int32 nPrivate3; - sal_Int32 nInfo; - String aTarget; - String aSubAdress; - - sal_Int32 nStartPos; - sal_Int32 nEndPos; - - String aConvSubString; - ESelection aESelection; - sal_Bool bSelection; -}; - -// Hilfsklasse zum Einlesen der PPT InteractiveInfoAtom -struct SVX_DLLPUBLIC PptInteractiveInfoAtom -{ - UINT32 nSoundRef; - UINT32 nExHyperlinkId; - UINT8 nAction; - UINT8 nOleVerb; - UINT8 nJump; - UINT8 nFlags; - UINT8 nHyperlinkType; - - // unknown, da Gesamtgroesse 16 ist - UINT8 nUnknown1; - UINT8 nUnknown2; - UINT8 nUnknown3; - -public: - - SVX_DLLPUBLIC friend SvStream& operator>>( SvStream& rIn, PptInteractiveInfoAtom& rAtom ); -}; - -enum PptPageKind { PPT_MASTERPAGE, PPT_SLIDEPAGE, PPT_NOTEPAGE }; - -enum PptPageFormat -{ PPTPF_SCREEN, // - PPTPF_USLETTER, // 8.5x11" - PPTPF_A4, // 210x297mm - PPTPF_35MMDIA, // DIA - PPTPF_OVERHEAD, // - PPTPF_CUSTOM -}; - -// Werte fuer den ULONG im PPT_PST_TextHeaderAtom -enum PPT_TextHeader -{ - PPTTH_TITLE, - PPTTH_BODY, - PPTTH_NOTES, - PPTTH_NOTUSED, - PPTTH_OTHER, // Text in a Shape - PPTTH_CENTERBODY, // Subtitle in Title-Slide - PPTTH_CENTERTITLE, // Title in Title-Slide - PPTTH_HALFBODY, // Body in two-column slide - PPTTH_QUARTERBODY // Body in four-body slide -}; - -#define TSS_TYPE_PAGETITLE (0) -#define TSS_TYPE_BODY (1) -#define TSS_TYPE_NOTES (2) -#define TSS_TYPE_UNUSED (3) -#define TSS_TYPE_TEXT_IN_SHAPE (4) -#define TSS_TYPE_SUBTITLE (5) -#define TSS_TYPE_TITLE (6) -#define TSS_TYPE_HALFBODY (7) -#define TSS_TYPE_QUARTERBODY (8) - -// Inventor-Id fuer PPT UserData -const UINT32 PPTInventor =UINT32('P')*0x00000001+ - UINT32('P')*0x00000100+ - UINT32('T')*0x00010000+ - UINT32('0')*0x01000000; - -// Object-Ids fuer StarDraw UserData -#define PPT_OBJECTINFO_ID (1) - -struct SVX_DLLPUBLIC PptDocumentAtom -{ - Size aSlidesPageSize; // Seitengroesse der Slides in 576DPI - Size aNotesPageSize; // Seitengroesse der Notes in 576DPI - // RatioAtom erstmal weggelassen - UINT32 nNotesMasterPersist; // 0=nicht vorhanden - UINT32 nHandoutMasterPersist; // 0=nicht vorhanden - UINT16 n1stPageNumber; // Seitennummer des ersten Slides - PptPageFormat eSlidesPageFormat; // Seitenformat der Slides - sal_Bool bEmbeddedTrueType : 1; // TrueType direkt im File? - sal_Bool bTitlePlaceholdersOmitted : 1; - sal_Bool bRightToLeft : 1; - sal_Bool bShowComments : 1; - -public: - - Size GetPageSize( const Size& rSiz ) const; - Size GetSlidesPageSize() const { return GetPageSize( aSlidesPageSize ); } - Size GetNotesPageSize() const { return GetPageSize( aNotesPageSize ); } - - friend SvStream& operator>>( SvStream& rIn, PptDocumentAtom& rAtom ); -}; - -struct PptSlideLayoutAtom -{ - INT32 eLayout; // 0..18 - BYTE aPlaceholderId[ 8 ]; - ULONG aPlacementId[ 8 ]; - -public: - - PptSlideLayoutAtom() { Clear(); } - void Clear(); - - // Das SlideLayoutAtom wird ohne Header eingelesen! - friend SvStream& operator>>( SvStream& rIn, PptSlideLayoutAtom& rAtom ); -}; - -struct PptSlideAtom -{ - PptSlideLayoutAtom aLayout; - UINT32 nMasterId; - UINT32 nNotesId; - UINT16 nFlags; - -public: - - PptSlideAtom() { Clear(); } - void Clear(); - - friend SvStream& operator>>(SvStream& rIn, PptSlideAtom& rAtom); -}; - -struct PptSlidePersistAtom -{ - UINT32 nPsrReference; - UINT32 nFlags; - UINT32 nNumberTexts; - UINT32 nSlideId; - UINT32 nReserved; // we will use nReserved temporarly to set the offset to SSSlideInfoAtom ( if possible ) - -public: - - PptSlidePersistAtom() { Clear(); } - void Clear(); - - friend SvStream& operator>>(SvStream& rIn, PptSlidePersistAtom& rAtom); -}; - -struct PptNotesAtom -{ - UINT32 nSlideId; - UINT16 nFlags; - -public: - - PptNotesAtom() { Clear(); } - void Clear(); - - friend SvStream& operator>>(SvStream& rIn, PptNotesAtom& rAtom); -}; - -struct PptColorSchemeAtom -{ - BYTE aData[32]; - -public: - PptColorSchemeAtom () { Clear(); } - void Clear(); - Color GetColor( USHORT nNum ) const; - - friend SvStream& operator>>(SvStream& rIn, PptColorSchemeAtom& rAtom); -}; - -struct PptFontEntityAtom -{ - String aName; - double fScaling; - sal_uInt8 lfClipPrecision; - sal_uInt8 lfQuality; - - sal_uInt32 nUniqueFontId; // not used anymore - CharSet eCharSet; - FontFamily eFamily; - FontPitch ePitch; - sal_Bool bAvailable; - - friend SvStream& operator>>(SvStream& rIn, PptFontEntityAtom& rAtom); -}; - -class PptFontCollection; -struct PptUserEditAtom -{ - DffRecordHeader aHd; - INT32 nLastSlideID; // ID of last visible slide - UINT32 nVersion; // This is major/minor/build which did the edit - UINT32 nOffsetLastEdit; // File offset of prev PptUserEditAtom - UINT32 nOffsetPersistDirectory; // Offset to PersistPtrs for this file version. - UINT32 nDocumentRef; - UINT32 nMaxPersistWritten; // Gesamtanzahl der Persisteintraege bis hierher. - INT16 eLastViewType; // enum view type - -public: - - PptUserEditAtom() : nOffsetPersistDirectory( 0 ) {} - - friend SvStream& operator>>( SvStream& rIn, PptUserEditAtom& rAtom ); -}; - -struct PptOEPlaceholderAtom -{ - UINT32 nPlacementId; - BYTE nPlaceholderId; - BYTE nPlaceholderSize; // 0=Full size, 1=Half size, 2=Quarter of Slide - -public: - - PptOEPlaceholderAtom() { Clear(); } - void Clear(); - - friend SvStream& operator>>( SvStream& rIn, PptOEPlaceholderAtom& rAtom ); -}; - -struct ProcessData; -struct PPTStyleSheet; -struct HeaderFooterEntry; -struct PptSlidePersistEntry -{ - PptSlidePersistAtom aPersistAtom; - PptSlideAtom aSlideAtom; - PptNotesAtom aNotesAtom; - PptColorSchemeAtom aColorScheme; // each slide includes this colorscheme atom - PPTStyleSheet* pStyleSheet; // stylesheet of this page ( only in masterpages ), since XP supports more than one masterpage - - sal_uInt32 HeaderFooterOfs[ 4 ]; // containing the ofs to the placeholder (only masterpage) - HeaderFooterEntry* pHeaderFooterEntry; - SvxMSDffSolverContainer* pSolverContainer; - sal_uInt32 nSlidePersistStartOffset;// is an array to the end of the SlidePersistAtom of this page, TextHeaderAtom is following - sal_uInt32 nSlidePersistEndOffset; - sal_uInt32 nBackgroundOffset; // fileoffset - sal_uInt32 nDrawingDgId; // valid, if not -1 - sal_uInt32* pPresentationObjects; // if valid, this is a pointer to an array that includes the offsets to the presentation objects - // on this masterpage for each instance ( 0 - 8 ); - SdrObject* pBObj; - sal_Bool bBObjIsTemporary; - - void* pDummy2; - PptPageKind ePageKind; // - - sal_Bool bNotesMaster : 1; // fuer NotesMaster - sal_Bool bHandoutMaster : 1; // fuer HandoutMaster - sal_Bool bStarDrawFiller : 1; // speziell fuer StarDraw -public: - PptSlidePersistEntry(); - ~PptSlidePersistEntry(); - UINT32 GetSlideId() const { return aPersistAtom.nSlideId; } -}; - -SV_DECL_PTRARR_DEL(_PptSlidePersistList,PptSlidePersistEntry*,16,16) - -#define PPTSLIDEPERSIST_ENTRY_NOTFOUND 0xFFFF - -class SVX_DLLPUBLIC PptSlidePersistList: public _PptSlidePersistList -{ - - public: - - USHORT FindPage( UINT32 nId ) const; -}; - -class SfxObjectShell; -struct PPTOleEntry -{ - sal_uInt32 nId; // OleId - sal_uInt32 nPersistPtr; // PersistPtr - sal_uInt32 nRecHdOfs; // points to the record header: ExObjListHd - SfxObjectShell* pShell; - sal_uInt16 nType; // maybe PPT_PST_ExEmbed or PPT_PST_ExControl - sal_uInt32 nAspect; // the aspect of the OLE object - - PPTOleEntry( sal_uInt32 nid, sal_uInt32 nOfs, SfxObjectShell* pSh, sal_uInt16 nT, sal_uInt32 nAsp ) : - nId ( nid ), - nRecHdOfs ( nOfs ), - pShell ( pSh ), - nType ( nT ), - nAspect ( nAsp ) {} -}; - -struct PptExOleObjAtom -{ - UINT32 nAspect; - UINT32 nDummy1; - UINT32 nId; - UINT32 nDummy2; - UINT32 nPersistPtr; - UINT32 nDummy4; - -public: - - friend SvStream& operator>>( SvStream& rIn, PptExOleObjAtom& rAtom ); -}; - -class PPTExtParaProv; -class SVX_DLLPUBLIC SdrEscherImport : public SvxMSDffManager -{ - -protected: - - friend class PPTTextObj; - friend class PPTPortionObj; - friend struct PPTStyleTextPropReader; - friend class ImplSdPPTImport; - - PptDocumentAtom aDocAtom; - DffRecordManager aDocRecManager; // contains all first level container and atoms of the document container - - List aHFMasterList; - List aOleObjectList; // contains PPTOleEntrys - - PptFontCollection* pFonts; - - sal_uInt32 nStreamLen; - sal_uInt16 nTextStylesIndex; - - CharSet eCharSetSystem; - - sal_Bool bWingdingsChecked : 1; - sal_Bool bWingdingsAvailable : 1; - sal_Bool bMonotypeSortsChecked : 1; - sal_Bool bMonotypeSortsAvailable : 1; - sal_Bool bTimesNewRomanChecked : 1; - sal_Bool bTimesNewRomanAvailable : 1; - - sal_Bool ReadString( String& rStr ) const; - // nur fuer PowerPoint-Filter: - virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const; - void CheckWingdings() const; - void CheckMonotypeSorts() const; - void CheckTimesNewRoman() const; - -public: - - PowerPointImportParam& rImportParam; - - void* pSdrEscherDummy1; - void* pSdrEscherDummy2; - void* pSdrEscherDummy3; - void* pSdrEscherDummy4; - - SdrEscherImport( PowerPointImportParam&, const String& rBaseURL ); - virtual ~SdrEscherImport(); - virtual FASTBOOL GetColorFromPalette( USHORT nNum, Color& rColor ) const; - virtual BOOL SeekToShape( SvStream& rSt, void* pClientData, UINT32 nId ) const; - PptFontEntityAtom* GetFontEnityAtom( UINT32 nNum ) const; - CharSet GetCharSet( UINT32 nNum ) const; - BOOL IsFontAvailable( UINT32 nNum ) const; - void RecolorGraphic( SvStream& rSt, sal_uInt32 nRecLen, Graphic& rGraph ); - using SvxMSDffManager::ReadObjText; - virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const; - virtual SdrObject* ProcessObj( SvStream& rSt, DffObjData& rData, void* pData, Rectangle& rTextRect, SdrObject* pObj ); - virtual void ProcessClientAnchor2( SvStream& rSt, DffRecordHeader& rHd, void* pData, DffObjData& rObj ); - void ImportHeaderFooterContainer( DffRecordHeader& rHeader, HeaderFooterEntry& rEntry ); -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -#define SD_HEADERFOOTER_DATE 1 -#define SD_HEADERFOOTER_TODAYDATE 2 -#define SD_HEADERFOOTER_USERDATE 4 -#define SD_HEADERFOOTER_SLIDENUMBER 8 -#define SD_HEADERFOOTER_HEADER 16 -#define SD_HEADERFOOTER_FOOTER 32 - -class SvxFieldItem; -struct SVX_DLLPUBLIC PPTFieldEntry -{ - UINT16 nPos; - UINT16 nTextRangeEnd; - SvxFieldItem* pField1; - SvxFieldItem* pField2; - String* pString; - - PPTFieldEntry() : nPos( 0 ), nTextRangeEnd( 0 ), pField1( NULL ), pField2( NULL ), pString( NULL ) {}; - ~PPTFieldEntry(); - - void SetDateTime( UINT32 nType ); - - // converting PPT date time format: - static void GetDateTime( const sal_uInt32 nVal, SvxDateFormat& eDateFormat, SvxTimeFormat& eTimeFormat ); -}; - -struct SVX_DLLPUBLIC HeaderFooterEntry -{ - const PptSlidePersistEntry* pMasterPersist; - String pPlaceholder[ 4 ]; - sal_uInt32 nAtom; - - sal_uInt32 GetMaskForInstance( UINT32 nInstance ); - sal_uInt32 IsToDisplay( UINT32 nInstance ); - sal_uInt32 NeedToImportInstance( const sal_uInt32 nInstance, const PptSlidePersistEntry& rSlidePersist ); - - HeaderFooterEntry( const PptSlidePersistEntry* pMaster = NULL ); - ~HeaderFooterEntry(); -}; - -struct ProcessData -{ - PptSlidePersistEntry& rPersistEntry; - SdPage* pPage; - List* pBackgroundColoredObjects; - sal_uInt32* pTableRowProperties; - - ProcessData( PptSlidePersistEntry& rP, SdPage* pP ) : - rPersistEntry ( rP ), - pPage ( pP ), - pBackgroundColoredObjects ( NULL ), - pTableRowProperties ( NULL ) {}; - ~ProcessData() { delete pBackgroundColoredObjects; delete[] pTableRowProperties; }; -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -class SdrTextObj; -class SfxObjectShell; -class SVX_DLLPUBLIC SdrPowerPointImport : public SdrEscherImport -{ - -protected: - - friend class PPTTextObj; - friend class PPTExtParaProv; - friend struct PPTStyleSheet; - friend class PPTNumberFormatCreator; - - BOOL bOk; - PptUserEditAtom aUserEditAtom; - PptColorSchemeAtom aPageColors; - List aHyperList; - UINT32* pPersistPtr; - ULONG nPersistPtrAnz; - - const PPTStyleSheet* pPPTStyleSheet; // this is the current stylesheet; - const PPTStyleSheet* pDefaultSheet; // this is a sheet we are using if no masterpage can be found, but that should - // never happen just preventing a crash - PptSlidePersistList* pMasterPages; - PptSlidePersistList* pSlidePages; - PptSlidePersistList* pNotePages; - USHORT nAktPageNum; - ULONG nDocStreamPos; - USHORT nPageColorsNum; - PptPageKind ePageColorsKind; - PptPageKind eAktPageKind; - -protected: - - sal_Bool SeekToAktPage(DffRecordHeader* pRecHd=NULL) const; - sal_Bool SeekToDocument(DffRecordHeader* pRecHd=NULL) const; - sal_Bool SeekToContentOfProgTag( sal_Int32 nVersion, SvStream& rSt, const DffRecordHeader& rProgTagBinaryDataHd, - DffRecordHeader& rContentHd ); - virtual SdrObject* ApplyTextObj( PPTTextObj* pTextObj, SdrTextObj* pText, SdPage* pPage, SfxStyleSheet*, SfxStyleSheet** ) const; - using SdrEscherImport::ReadObjText; - virtual SdrObject* ReadObjText( PPTTextObj* pTextObj, SdrObject* pObj, SdPage* pPage ) const; - // --> OD 2004-12-14 #i32596# - new parameter <_nCalledByGroup>, which - // indicates, if the OLE object is imported inside a group object. - virtual SdrObject* ImportOLE( long nOLEId, - const Graphic& rGraf, - const Rectangle& rBoundRect, - const Rectangle& rVisArea, - const int _nCalledByGroup, - sal_Int64 nAspect ) const; - // <-- - SvMemoryStream* ImportExOleObjStg( UINT32 nPersistPtr, UINT32& nOleId ) const; - SdrPage* MakeBlancPage(sal_Bool bMaster) const; - sal_Bool ReadFontCollection(); - sal_Bool ForceFontCollection() const { return pFonts!=NULL?TRUE:((SdrPowerPointImport*)this)->ReadFontCollection(); } - PptSlidePersistList* GetPageList(PptPageKind ePageKind) const; - UINT32 GetAktPageId(); - UINT32 GetMasterPageId(USHORT nPageNum, PptPageKind ePageKind) const; - UINT32 GetNotesPageId(USHORT nPageNum ) const; - SdrOutliner* GetDrawOutliner( SdrTextObj* pSdrText ) const; - void SeekOle( SfxObjectShell* pShell, sal_uInt32 nFilterOptions ); - -public: - SdrPowerPointImport( PowerPointImportParam&, const String& rBaseURL ); - virtual ~SdrPowerPointImport(); - USHORT GetPageCount( PptPageKind eKind = PPT_SLIDEPAGE ) const; - void SetPageNum( USHORT nPageNum, PptPageKind = PPT_SLIDEPAGE ); - USHORT GetPageNum() const { return nAktPageNum; } - PptPageKind GetPageKind() const { return eAktPageKind; } - Size GetPageSize() const; - SdrObject* ImportPageBackgroundObject( const SdrPage& rPage, sal_uInt32& nBgFileOffset, sal_Bool bForce ); - sal_Bool IsNoteOrHandout( USHORT nPageNum, PptPageKind ePageKind ) const; - sal_Bool HasMasterPage( USHORT nPageNum, PptPageKind ePageKind = PPT_SLIDEPAGE ) const; - USHORT GetMasterPageIndex( USHORT nPageNum, PptPageKind ePageKind = PPT_SLIDEPAGE ) const; - - void ImportPage( SdrPage* pPage, const PptSlidePersistEntry* pMasterPersist = NULL ); - virtual FASTBOOL GetColorFromPalette(USHORT nNum, Color& rColor) const; - virtual BOOL SeekToShape( SvStream& rSt, void* pClientData, UINT32 nId ) const; - sal_Unicode PPTSubstitute( UINT16 nFont, sal_Unicode nChar, - UINT32& nMappedFontId, Font& rFont, char nDefault ) const; - const PptDocumentAtom& GetDocumentAtom() const { return aDocAtom; } - virtual const PptSlideLayoutAtom* GetSlideLayoutAtom() const; - SdrObject* CreateTable( SdrObject* pGroupObject, sal_uInt32* pTableArry, SvxMSDffSolverContainer* ); -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -struct PPTTextCharacterStyleAtomInterpreter -{ - sal_uInt16 nFlags1; - sal_uInt16 nFlags2; - sal_uInt16 nFlags3; - sal_Int32 n1; - sal_uInt16 nFontHeight; - sal_Int32 nFontColor; - - PPTTextCharacterStyleAtomInterpreter(); - ~PPTTextCharacterStyleAtomInterpreter(); - - sal_Bool Read( SvStream& rIn, const DffRecordHeader& rRecHd ); - - sal_uInt32 GetColor( sal_uInt32 nDefault ); -}; - -struct PPTTextParagraphStyleAtomInterpreter -{ - sal_Bool bValid; - sal_Bool bForbiddenRules; - sal_Bool bHangingPunctuation; - sal_Bool bLatinTextWrap; - - PPTTextParagraphStyleAtomInterpreter(); - ~PPTTextParagraphStyleAtomInterpreter(); - - sal_Bool Read( SvStream& rIn, const DffRecordHeader& rRecHd ); -}; - -struct PPTTextSpecInfo -{ - sal_uInt32 nCharIdx; - sal_uInt16 nLanguage[ 3 ]; - sal_uInt16 nDontKnow; - - PPTTextSpecInfo( sal_uInt32 nCharIdx ); - ~PPTTextSpecInfo(); -}; - -struct PPTTextSpecInfoAtomInterpreter -{ - sal_Bool bValid; - List aList; - - PPTTextSpecInfoAtomInterpreter(); - ~PPTTextSpecInfoAtomInterpreter(); - - sal_Bool Read( SvStream& rIn, const DffRecordHeader& rRecHd, - sal_uInt16 nRecordType, const PPTTextSpecInfo* pTextSpecDefault = NULL ); - -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -#define PPT_STYLESHEETENTRYS 9 - -struct PPTExtParaLevel -{ - sal_uInt32 mnExtParagraphMask; - sal_uInt16 mnBuBlip; - sal_uInt16 mnHasAnm; - sal_uInt32 mnAnmScheme; - sal_uInt32 mpfPP10Ext; - sal_uInt32 mnExtCharacterMask; - sal_uInt32 mcfPP10Ext; - sal_Bool mbSet; - - PPTExtParaLevel(); - friend SvStream& operator>>( SvStream& rIn, PPTExtParaLevel& rL ); -}; - -struct PPTExtParaSheet -{ - PPTExtParaLevel aExtParaLevel[ 5 ]; -}; - -struct PPTBuGraEntry -{ - UINT32 nInstance; - Graphic aBuGra; - - PPTBuGraEntry( Graphic& rGraphic, UINT32 nInstance ); -}; - -class PPTExtParaProv -{ - List aBuGraList; - - public : - BOOL bStyles; - BOOL bGraphics; - DffRecordManager aExtendedPresRules; - - PPTExtParaSheet aExtParaSheet[ PPT_STYLESHEETENTRYS ]; - - BOOL GetGraphic( UINT32 nInstance, Graphic& rGraphic ) const; - - PPTExtParaProv( SdrPowerPointImport& rManager, SvStream& rSt, - const DffRecordHeader* pMainMasterHd ); - ~PPTExtParaProv(); -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -struct PPTCharLevel -{ - Color mnFontColorInStyleSheet; - sal_uInt32 mnFontColor; - sal_uInt16 mnFlags; - sal_uInt16 mnFont; - sal_uInt16 mnAsianOrComplexFont; - sal_uInt16 mnFontHeight; - sal_uInt16 mnEscapement; -}; - -struct PPTCharSheet -{ - PPTCharLevel maCharLevel[ 5 ]; - - PPTCharSheet( sal_uInt32 nInstance ); - PPTCharSheet( const PPTCharSheet& rCharSheet ); - - void Read( SvStream& rIn, sal_Bool bMasterStyle, sal_uInt32 nLevel, sal_Bool bFirst ); -}; - -struct PPTParaLevel -{ - sal_uInt16 mnBuFlags; - sal_uInt16 mnBulletChar; - sal_uInt16 mnBulletFont; - sal_uInt16 mnBulletHeight; - sal_uInt32 mnBulletColor; - - sal_uInt16 mnAdjust; - sal_uInt16 mnLineFeed; - sal_uInt16 mnUpperDist; - sal_uInt16 mnLowerDist; - sal_uInt16 mnTextOfs; - sal_uInt16 mnBulletOfs; - sal_uInt16 mnDefaultTab; - sal_uInt16 mnAsianLineBreak; // bit0: use asian rules for first and last character - // 1: do not wrap latin text in the middle of the word - // 2: allow hanging punctuation - sal_uInt16 mnBiDi; -}; - -struct PPTParaSheet -{ - public: - - PPTParaLevel maParaLevel[ 5 ]; - - PPTParaSheet( sal_uInt32 nInstance ); - PPTParaSheet( const PPTParaSheet& rParaSheet ); - - void Read( SdrPowerPointImport& rMan, SvStream& rIn, sal_Bool bMasterStyle, - sal_uInt32 nLevel, sal_Bool bFirst ); -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -class PPTParagraphObj; -class PPTNumberFormatCreator -{ - UINT32 nIsBullet; - UINT32 nBulletChar; - UINT32 nBulletFont; - UINT32 nBulletHeight; - UINT32 nBulletColor; - UINT32 nTextOfs; - UINT32 nBulletOfs; - - void ImplGetNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, UINT32 nLevel ); - BOOL ImplGetExtNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, UINT32 nLevel, - UINT32 nInstance, UINT32 nInstanceInSheet, boost::optional< sal_Int16 >& rStartNumbering, - UINT32 nFontHeight, PPTParagraphObj* pPara ); - - protected : - - PPTNumberFormatCreator( PPTExtParaProv* ); - ~PPTNumberFormatCreator(); - - public : - - PPTExtParaProv* pExtParaProv; - - void GetNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, UINT32 nLevel, - const PPTParaLevel& rParaLevel, const PPTCharLevel& rCharLevel, UINT32 nInstance ); - - BOOL GetNumberFormat( SdrPowerPointImport& rMan, SvxNumberFormat& rNumberFormat, - PPTParagraphObj* pPara, UINT32 nInstanceInSheet, boost::optional< sal_Int16 >& rStartNumbering ); -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -class SvxNumBulletItem; -struct PPTStyleSheet : public PPTNumberFormatCreator -{ - PPTTextSpecInfo maTxSI; - PPTCharSheet* mpCharSheet[ PPT_STYLESHEETENTRYS ]; - PPTParaSheet* mpParaSheet[ PPT_STYLESHEETENTRYS ]; - SvxNumBulletItem* mpNumBulletItem[ PPT_STYLESHEETENTRYS ]; - void* mpDummy; - - PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rSt, SdrPowerPointImport&, - const PPTTextCharacterStyleAtomInterpreter&, const PPTTextParagraphStyleAtomInterpreter&, const PPTTextSpecInfo& ); - ~PPTStyleSheet(); -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -struct ImplPPTParaPropSet -{ - sal_uInt32 mnRefCount; - - sal_uInt16 mnDepth; - sal_uInt32 mnAttrSet; - sal_uInt32 mnBulletColor; - sal_uInt16 mpArry[ 22 ]; - - sal_uInt32 mnExtParagraphMask; - sal_uInt32 mnAnmScheme; - sal_uInt16 mnHasAnm; - sal_uInt16 mnBuBlip; - - sal_uInt32 nDontKnow1; - sal_uInt32 nDontKnow2; - sal_uInt16 nDontKnow2bit06; - - ImplPPTParaPropSet(){ mnRefCount = 1; mnAttrSet = 0; mnExtParagraphMask = 0; mnDepth = 0; }; -}; - -struct PPTParaPropSet -{ - sal_uInt32 mnOriginalTextPos; - ImplPPTParaPropSet* pParaSet; - - PPTParaPropSet(); - PPTParaPropSet( PPTParaPropSet& rParaPropSet ); - ~PPTParaPropSet(); - - PPTParaPropSet& operator=( PPTParaPropSet& rParaPropSet ); -}; - -struct ImplPPTCharPropSet -{ - sal_uInt32 mnRefCount; - - sal_uInt32 mnAttrSet; - sal_uInt16 mnFlags; - sal_uInt32 mnColor; - sal_uInt16 mnFont; - sal_uInt16 mnAsianOrComplexFont; - sal_uInt16 mnANSITypeface; - sal_uInt16 mnFontHeight; - sal_uInt16 mnEscapement; - sal_uInt16 mnSymbolFont; - - ImplPPTCharPropSet(){ mnRefCount = 1; mnAttrSet = 0; }; -}; - -struct PPTCharPropSet -{ - - sal_uInt32 mnOriginalTextPos; - sal_uInt32 mnParagraph; - String maString; - SvxFieldItem* mpFieldItem; - sal_uInt16 mnLanguage[ 3 ]; - - ImplPPTCharPropSet* pCharSet; - - void SetFont( UINT16 nFont ); - void SetColor( sal_uInt32 nColor ); - - PPTCharPropSet( sal_uInt32 nParagraph ); - PPTCharPropSet( PPTCharPropSet& rCharPropSet ); - PPTCharPropSet( PPTCharPropSet& rCharPropSet, sal_uInt32 nParagraph ); - ~PPTCharPropSet(); - - PPTCharPropSet& operator=( PPTCharPropSet& rCharPropSet ); - - private : - - void ImplMakeUnique(); -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -struct PPTTabEntry -{ - sal_uInt16 nOffset; - sal_uInt16 nStyle; -}; - -struct PPTRuler -{ - UINT32 nRefCount; - - INT32 nFlags; - UINT16 nDefaultTab; - UINT16 nTextOfs[ 5 ]; - UINT16 nBulletOfs[ 5 ]; - PPTTabEntry* pTab; - UINT16 nTabCount; - - PPTRuler(); - ~PPTRuler(); -}; - -struct PPTTextRulerInterpreter -{ - PPTRuler *mpImplRuler; - - PPTTextRulerInterpreter(); - PPTTextRulerInterpreter( PPTTextRulerInterpreter& rRuler ); - PPTTextRulerInterpreter( UINT32 nFileOfs, SdrPowerPointImport&, DffRecordHeader& rHd, SvStream& rIn ); - ~PPTTextRulerInterpreter(); - - sal_uInt16 GetTabOffsetByIndex( sal_uInt16 nIndex ) const { return mpImplRuler->pTab[ nIndex ].nOffset; }; - sal_uInt16 GetTabStyleByIndex( sal_uInt16 nIndex ) const { return mpImplRuler->pTab[ nIndex ].nStyle; }; - UINT16 GetTabCount() const { return mpImplRuler->nTabCount; }; - BOOL GetDefaultTab( UINT32 nLevel, UINT16& nValue ) const; - BOOL GetTextOfs( UINT32 nLevel, UINT16& nValue ) const; - BOOL GetBulletOfs( UINT32 nLevel, UINT16& nValue ) const; - - PPTTextRulerInterpreter& operator=( PPTTextRulerInterpreter& rRuler ); -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -#define PPT_SPEC_NEWLINE 0x10000 -#define PPT_SPEC_SYMBOL 0x20000 -#define PPT_SPEC_USE_STARBATS 0x40000 - -struct StyleTextProp9 -{ - sal_uInt32 mnExtParagraphMask; - sal_uInt16 mnBuBlip; - sal_uInt16 mnHasAnm; - sal_uInt32 mnAnmScheme; - sal_uInt32 mpfPP10Ext; - sal_uInt32 mnExtCharacterMask; - sal_uInt32 mncfPP10Ext; - sal_uInt32 mnSpecialInfoMask; - sal_uInt32 mnPP10Ext; - sal_uInt16 mfBidi; - - StyleTextProp9() - : mnExtParagraphMask( 0 ) - , mnBuBlip( 0 ) - , mnHasAnm( 0 ) - , mnAnmScheme( 0 ) - , mpfPP10Ext( 0 ) - , mnExtCharacterMask( 0 ) - , mncfPP10Ext( 0 ) - , mnSpecialInfoMask( 0 ) - , mnPP10Ext( 0 ) - , mfBidi( 0 ) - { - } - void Read( SvStream& rSt ); -}; - -struct PPTStyleTextPropReader -{ - List aSpecMarkerList; // hiword -> Flags, loword -> Position - List aParaPropList; - List aCharPropList; - - PPTStyleTextPropReader( SvStream& rIn, SdrPowerPointImport&, const DffRecordHeader& rClientTextBoxHd, - PPTTextRulerInterpreter& rInterpreter, const DffRecordHeader& rExtParaHd, sal_uInt32 nTextInstance ); - - void Init( SvStream& rIn, SdrPowerPointImport&, const DffRecordHeader& rClientTextBoxHd, - PPTTextRulerInterpreter& rInterpreter, const DffRecordHeader& rExtParaHd, sal_uInt32 nTextInstance ); - void ReadParaProps( SvStream& rIn, SdrPowerPointImport& rMan, const DffRecordHeader& rTextHeader, - const String& aString, PPTTextRulerInterpreter& rRuler, - sal_uInt32& nCharCount, sal_Bool& bTextPropAtom ); - void ReadCharProps( SvStream& rIn, PPTCharPropSet& aCharPropSet, const String& aString, - sal_uInt32& nCharCount, sal_uInt32 nCharAnzRead, - sal_Bool& bTextPropAtom, sal_uInt32 nExtParaPos, - const std::vector< StyleTextProp9 >& aStyleTextProp9, - sal_uInt32& nExtParaFlags, sal_uInt16& nBuBlip, - sal_uInt16& nHasAnm, sal_uInt32& nAnmScheme ); - - ~PPTStyleTextPropReader(); -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -class SvxFieldItem; -class SVX_DLLPUBLIC PPTPortionObj : public PPTCharPropSet -{ - - friend class PPTParagraphObj; - - const PPTStyleSheet& mrStyleSheet; - UINT32 mnInstance; - UINT32 mnDepth; - - public : - - BOOL GetAttrib( UINT32 nAttr, UINT32& nVal, UINT32 nInstanceInSheet ); - SvxFieldItem* GetTextField(); - - PPTPortionObj( const PPTStyleSheet&, UINT32 nInstance, UINT32 nDepth ); - PPTPortionObj( PPTCharPropSet&, const PPTStyleSheet&, UINT32 nInstance, UINT32 nDepth ); - PPTPortionObj( PPTPortionObj& ); - ~PPTPortionObj(); - - // the following function should be removed during next full update - void ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, UINT32 nInstanceInSheet ); - void ApplyTo( SfxItemSet& rSet, SdrPowerPointImport& rManager, UINT32 nInstanceInSheet, const PPTTextObj* pTextObj ); - UINT32 Count() const { return ( mpFieldItem ) ? 1 : maString.Len(); }; - BOOL HasTabulator(); -}; - -class SVX_DLLPUBLIC PPTParagraphObj : public PPTParaPropSet, public PPTNumberFormatCreator, public PPTTextRulerInterpreter -{ - friend class PPTTextObj; - friend class PPTNumberFormatCreator; - - const PPTStyleSheet& mrStyleSheet; - UINT32 mnInstance; - - protected : - - void ImplClear(); - - public : - - BOOL mbTab; // if true, this paragraph has tabulators in text - - UINT32 mnCurrentObject; - UINT32 mnPortionCount; - PPTPortionObj** mpPortionList; - - void UpdateBulletRelSize( sal_uInt32& nBulletRelSize ) const; - BOOL GetAttrib( UINT32 nAttr, UINT32& nVal, UINT32 nInstanceInSheet ); - - PPTParagraphObj( const PPTStyleSheet&, UINT32 nInstance, UINT16 nDepth ); - PPTParagraphObj( PPTStyleTextPropReader&, const PPTStyleSheet&, UINT32 nInstance, PPTTextRulerInterpreter& rRuler ); - ~PPTParagraphObj(); - - UINT32 GetTextSize(); - PPTPortionObj* First(); - PPTPortionObj* Next(); - - void AppendPortion( PPTPortionObj& rPortion ); - void ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >& rStartNumbering, SdrPowerPointImport& rManager, UINT32 nInstanceInSheet, const PPTParagraphObj* pPrev ); -}; - -#define PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_LEFT 1 -#define PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_CENTER 2 -#define PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_RIGHT 4 -#define PPT_TEXTOBJ_FLAGS_PARA_ALIGNMENT_USED_BLOCK 8 -#define PPT_TEXTOBJ_FLAGS_VERTICAL 16 - -struct ImplPPTTextObj -{ - UINT32 mnRefCount; - UINT32 mnShapeId; - UINT32 mnShapeMaster; - PptOEPlaceholderAtom* mpPlaceHolderAtom; - UINT16 mnInstance; - UINT16 mnDestinationInstance; - MSO_SPT meShapeType; - - UINT32 mnCurrentObject; - UINT32 mnParagraphCount; - PPTParagraphObj** mpParagraphList; - PptSlidePersistEntry& mrPersistEntry; - - sal_uInt32 mnTextFlags; - - ImplPPTTextObj( PptSlidePersistEntry& rPersistEntry ) : mrPersistEntry ( rPersistEntry ) {}; -}; - -class PPTTextObj -{ - ImplPPTTextObj* mpImplTextObj; - void ImplClear(); - - PPTTextObj(){}; - public : - PPTTextObj( SvStream& rSt, SdrPowerPointImport&, PptSlidePersistEntry&, DffObjData* ); - PPTTextObj( PPTTextObj& rTextObj ); - ~PPTTextObj(); - - UINT32 GetCurrentIndex() const { return mpImplTextObj->mnCurrentObject; }; - UINT32 Count() const { return mpImplTextObj->mnParagraphCount; }; - PPTParagraphObj* First(); - PPTParagraphObj* Next(); - MSO_SPT GetShapeType() const { return mpImplTextObj->meShapeType; }; - UINT32 GetInstance() const { return mpImplTextObj->mnInstance; }; - void SetInstance( UINT16 nInstance ) { mpImplTextObj->mnInstance = nInstance; }; - UINT32 GetDestinationInstance() const { return mpImplTextObj->mnDestinationInstance; }; - void SetDestinationInstance( UINT16 nInstance ) { mpImplTextObj->mnDestinationInstance = nInstance; }; - PptOEPlaceholderAtom* GetOEPlaceHolderAtom() const { return mpImplTextObj->mpPlaceHolderAtom; }; - sal_uInt32 GetTextFlags() const { return mpImplTextObj->mnTextFlags; }; - void SetVertical( sal_Bool bVertical ) - { - if ( bVertical ) - mpImplTextObj->mnTextFlags |= PPT_TEXTOBJ_FLAGS_VERTICAL; - else - mpImplTextObj->mnTextFlags &= ~PPT_TEXTOBJ_FLAGS_VERTICAL; - } - sal_Bool GetVertical() const { return ( mpImplTextObj->mnTextFlags & PPT_TEXTOBJ_FLAGS_VERTICAL ) != 0; }; - const SfxItemSet* GetBackground() const; - - PPTTextObj& operator=( PPTTextObj& rTextObj ); -}; - -class PPTConvertOCXControls : public SvxMSConvertOCXControls -{ - virtual const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > & GetDrawPage(); - PptPageKind ePageKind; - public : - - PPTConvertOCXControls( SfxObjectShell* pDSh, PptPageKind ePKind ) : - SvxMSConvertOCXControls ( pDSh, NULL ), - ePageKind ( ePKind ){}; - - virtual sal_Bool InsertControl( - const com::sun::star::uno::Reference< - com::sun::star::form::XFormComponent > &rFComp, - const com::sun::star::awt::Size& rSize, - com::sun::star::uno::Reference< com::sun::star::drawing::XShape > *pShape, - BOOL bFloatingCtrl ); -}; - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -// Powerpoint Recordtypen -#define PPT_PST_Unknown 0 -#define PPT_PST_SubContainerCompleted 1 -#define PPT_PST_IRRAtom 2 -#define PPT_PST_PSS 3 -#define PPT_PST_SubContainerException 4 -#define PPT_PST_ClientSignal1 6 -#define PPT_PST_ClientSignal2 7 -#define PPT_PST_PowerPointStateInfoAtom 10 -#define PPT_PST_Document 1000 -#define PPT_PST_DocumentAtom 1001 -#define PPT_PST_EndDocument 1002 -#define PPT_PST_SlidePersist 1003 -#define PPT_PST_SlideBase 1004 -#define PPT_PST_SlideBaseAtom 1005 -#define PPT_PST_Slide 1006 -#define PPT_PST_SlideAtom 1007 -#define PPT_PST_Notes 1008 -#define PPT_PST_NotesAtom 1009 -#define PPT_PST_Environment 1010 -#define PPT_PST_SlidePersistAtom 1011 -#define PPT_PST_Scheme 1012 -#define PPT_PST_SchemeAtom 1013 -#define PPT_PST_DocViewInfo 1014 -#define PPT_PST_SslideLayoutAtom 1015 -#define PPT_PST_MainMaster 1016 -#define PPT_PST_SSSlideInfoAtom 1017 -#define PPT_PST_SlideViewInfo 1018 -#define PPT_PST_GuideAtom 1019 -#define PPT_PST_ViewInfo 1020 -#define PPT_PST_ViewInfoAtom 1021 -#define PPT_PST_SlideViewInfoAtom 1022 -#define PPT_PST_VBAInfo 1023 -#define PPT_PST_VBAInfoAtom 1024 -#define PPT_PST_SSDocInfoAtom 1025 -#define PPT_PST_Summary 1026 -#define PPT_PST_Texture 1027 -#define PPT_PST_VBASlideInfo 1028 -#define PPT_PST_VBASlideInfoAtom 1029 -#define PPT_PST_DocRoutingSlip 1030 -#define PPT_PST_OutlineViewInfo 1031 -#define PPT_PST_SorterViewInfo 1032 -#define PPT_PST_ExObjList 1033 -#define PPT_PST_ExObjListAtom 1034 -#define PPT_PST_PPDrawingGroup 1035 -#define PPT_PST_PPDrawing 1036 -#define PPT_PST_NewlyAddedAtomByXP1037 1037 -#define PPT_PST_NamedShows 1040 -#define PPT_PST_NamedShow 1041 -#define PPT_PST_NamedShowSlides 1042 -#define PPT_PST_List 2000 -#define PPT_PST_FontCollection 2005 -#define PPT_PST_ListPlaceholder 2017 -#define PPT_PST_BookmarkCollection 2019 -#define PPT_PST_SoundCollection 2020 -#define PPT_PST_SoundCollAtom 2021 -#define PPT_PST_Sound 2022 -#define PPT_PST_SoundData 2023 -#define PPT_PST_BookmarkSeedAtom 2025 -#define PPT_PST_GuideList 2026 -#define PPT_PST_RunArray 2028 -#define PPT_PST_RunArrayAtom 2029 -#define PPT_PST_ArrayElementAtom 2030 -#define PPT_PST_Int4ArrayAtom 2031 -#define PPT_PST_ColorSchemeAtom 2032 - -// these atoms first was seen in ppt2000 in a private Tag atom -#define PPT_PST_ExtendedBuGraContainer 2040 // consist of 4041 -#define PPT_PST_ExtendedBuGraAtom 2041 // the instance of this atom indices the current graphic - -#define PPT_PST_OEShape 3008 -#define PPT_PST_ExObjRefAtom 3009 -#define PPT_PST_OEPlaceholderAtom 3011 -#define PPT_PST_GrColor 3020 -#define PPT_PST_GrectAtom 3025 -#define PPT_PST_GratioAtom 3031 -#define PPT_PST_Gscaling 3032 -#define PPT_PST_GpointAtom 3034 -#define PPT_PST_OEShapeAtom 3035 -#define PPT_PST_OutlineTextRefAtom 3998 -#define PPT_PST_TextHeaderAtom 3999 -#define PPT_PST_TextCharsAtom 4000 -#define PPT_PST_StyleTextPropAtom 4001 -#define PPT_PST_BaseTextPropAtom 4002 -#define PPT_PST_TxMasterStyleAtom 4003 -#define PPT_PST_TxCFStyleAtom 4004 -#define PPT_PST_TxPFStyleAtom 4005 -#define PPT_PST_TextRulerAtom 4006 -#define PPT_PST_TextBookmarkAtom 4007 -#define PPT_PST_TextBytesAtom 4008 -#define PPT_PST_TxSIStyleAtom 4009 -#define PPT_PST_TextSpecInfoAtom 4010 -#define PPT_PST_DefaultRulerAtom 4011 - -// these atoms first was seen in ppt2000 in a private Tag atom -#define PPT_PST_ExtendedParagraphAtom 4012 -#define PPT_PST_ExtendedParagraphMasterAtom 4013 -#define PPT_PST_ExtendedPresRuleContainer 4014 // consist of 4012, 4015, -#define PPT_PST_ExtendedParagraphHeaderAtom 4015 // the instance of this atom indices the current presobj - // the first UINT32 in this atom indices the current slideId -#define PPT_PST_NewlyAddedAtom4016 4016 - -#define PPT_PST_FontEntityAtom 4023 -#define PPT_PST_FontEmbedData 4024 -#define PPT_PST_TypeFace 4025 -#define PPT_PST_CString 4026 -#define PPT_PST_ExternalObject 4027 -#define PPT_PST_MetaFile 4033 -#define PPT_PST_ExOleObj 4034 -#define PPT_PST_ExOleObjAtom 4035 -#define PPT_PST_ExPlainLinkAtom 4036 -#define PPT_PST_CorePict 4037 -#define PPT_PST_CorePictAtom 4038 -#define PPT_PST_ExPlainAtom 4039 -#define PPT_PST_SrKinsoku 4040 -#define PPT_PST_Handout 4041 -#define PPT_PST_ExEmbed 4044 -#define PPT_PST_ExEmbedAtom 4045 -#define PPT_PST_ExLink 4046 -#define PPT_PST_ExLinkAtom_old 4047 -#define PPT_PST_BookmarkEntityAtom 4048 -#define PPT_PST_ExLinkAtom 4049 -#define PPT_PST_SrKinsokuAtom 4050 -#define PPT_PST_ExHyperlinkAtom 4051 -#define PPT_PST_ExPlain 4053 -#define PPT_PST_ExPlainLink 4054 -#define PPT_PST_ExHyperlink 4055 -#define PPT_PST_SlideNumberMCAtom 4056 -#define PPT_PST_HeadersFooters 4057 -#define PPT_PST_HeadersFootersAtom 4058 -#define PPT_PST_RecolorEntryAtom 4062 -#define PPT_PST_TxInteractiveInfoAtom 4063 -#define PPT_PST_EmFormatAtom 4065 -#define PPT_PST_CharFormatAtom 4066 -#define PPT_PST_ParaFormatAtom 4067 -#define PPT_PST_MasterText 4068 -#define PPT_PST_RecolorInfoAtom 4071 -#define PPT_PST_ExQuickTime 4073 -#define PPT_PST_ExQuickTimeMovie 4074 -#define PPT_PST_ExQuickTimeMovieData 4075 -#define PPT_PST_ExSubscription 4076 -#define PPT_PST_ExSubscriptionSection 4077 -#define PPT_PST_ExControl 4078 -#define PPT_PST_ExControlAtom 4091 -#define PPT_PST_SlideListWithText 4080 -#define PPT_PST_AnimationInfoAtom 4081 -#define PPT_PST_InteractiveInfo 4082 -#define PPT_PST_InteractiveInfoAtom 4083 -#define PPT_PST_SlideList 4084 -#define PPT_PST_UserEditAtom 4085 -#define PPT_PST_CurrentUserAtom 4086 -#define PPT_PST_DateTimeMCAtom 4087 -#define PPT_PST_GenericDateMCAtom 4088 -#define PPT_PST_HeaderMCAtom 4089 -#define PPT_PST_FooterMCAtom 4090 -#define PPT_PST_ExMediaAtom 4100 -#define PPT_PST_ExVideo 4101 -#define PPT_PST_ExAviMovie 4102 -#define PPT_PST_ExMCIMovie 4103 -#define PPT_PST_ExMIDIAudio 4109 -#define PPT_PST_ExCDAudio 4110 -#define PPT_PST_ExWAVAudioEmbedded 4111 -#define PPT_PST_ExWAVAudioLink 4112 -#define PPT_PST_ExOleObjStg 4113 -#define PPT_PST_ExCDAudioAtom 4114 -#define PPT_PST_ExWAVAudioEmbeddedAtom 4115 -#define PPT_PST_AnimationInfo 4116 -#define PPT_PST_RTFDateTimeMCAtom 4117 -#define PPT_PST_ProgTags 5000 -#define PPT_PST_ProgStringTag 5001 -#define PPT_PST_ProgBinaryTag 5002 -#define PPT_PST_BinaryTagData 5003 -#define PPT_PST_PrintOptions 6000 -#define PPT_PST_PersistPtrFullBlock 6001 -#define PPT_PST_PersistPtrIncrementalBlock 6002 - -// these atoms first was seen in ppt2000 in a private Tag atom -#define PPT_PST_NewlyAddedAtomByPPT2000_6010 6010 -#define PPT_PST_NewlyAddedAtomByPPT2000_6011 6011 - -#define PPT_PST_RulerIndentAtom 10000 -#define PPT_PST_GscalingAtom 10001 -#define PPT_PST_GrColorAtom 10002 -#define PPT_PST_GLPointAtom 10003 -#define PPT_PST_GlineAtom 10004 - -#define PPT_PST_NewlyAddedAtomByXP11008 11008 -#define PPT_PST_NewlyAddedAtomByXP11010 11010 -#define PPT_PST_Comment10 12000 -#define PPT_PST_CommentAtom10 12001 -#define PPT_PST_NewlyAddedAtomByXP12004 12004 -#define PPT_PST_NewlyAddedAtomByXP12010 12010 -#define PPT_PST_NewlyAddedAtomByXP12011 12011 -#define PPT_PST_NewlyAddedAtomByXP14001 14001 - -// Attribute fuer PptTextStyleSheet -#define PPT_ParaAttr_BulletOn 0 //00000001 -#define PPT_ParaAttr_BuHardFont 1 //00000002 -#define PPT_ParaAttr_BuHardColor 2 //00000004 -#define PPT_ParaAttr_BuHardHeight 3 //00000008 -#define PPT_ParaAttr_BulletFont 4 //00000010 -#define PPT_ParaAttr_BulletColor 5 //00000020 -#define PPT_ParaAttr_BulletHeight 6 //00000040 -#define PPT_ParaAttr_BulletChar 7 //00000080 - -#define PPT_ParaAttr_DontKnow1 8 //00000100 -#define PPT_ParaAttr_DontKnow2 9 //00000200 -#define PPT_ParaAttr_DontKnow3 10 //00000400 -#define PPT_ParaAttr_Adjust 11 //00000800 0000=Left, 0001=Center, 0002=Right, 0003=Block - -#define PPT_ParaAttr_LineFeed 12 //00001000 -#define PPT_ParaAttr_UpperDist 13 //00002000 ist bei Textframes default immer auf 0032 gesetzt -#define PPT_ParaAttr_LowerDist 14 //00004000 -#define PPT_ParaAttr_TextOfs 15 //00008000 - -#define PPT_ParaAttr_BulletOfs 16 //00010000 -#define PPT_ParaAttr_DefaultTab 17 //00020000 -#define PPT_ParaAttr_AsianLB_1 18 -#define PPT_ParaAttr_AsianLB_2 19 -#define PPT_ParaAttr_AsianLB_3 20 -#define PPT_ParaAttr_BiDi 21 //00200000 - -#define PPT_CharAttr_Bold 0 //00000001 -#define PPT_CharAttr_Italic 1 //00000002 -#define PPT_CharAttr_Underline 2 //00000004 -#define PPT_CharAttr_Shadow 4 //00000010 -#define PPT_CharAttr_Strikeout 8 //00000100 -#define PPT_CharAttr_Embossed 9 //00000200 -#define PPT_CharAttr_ResetNumbering 10 //00000400 -#define PPT_CharAttr_EnableNumbering1 11 //00000800 -#define PPT_CharAttr_EnableNumbering2 12 //00001000 -#define PPT_CharAttr_Font 16 //00010000 -#define PPT_CharAttr_AsianOrComplexFont 21 //00200000 -#define PPT_CharAttr_ANSITypeface 22 //00400000 -#define PPT_CharAttr_Symbol 23 //00800000 -#define PPT_CharAttr_FontHeight 17 //00020000 -#define PPT_CharAttr_FontColor 18 //00040000 -#define PPT_CharAttr_Escapement 19 //00080000 - -// Werte fuer PptSlideLayoutAtom.eLayout -#define PPT_LAYOUT_TITLESLIDE 0 // The slide is a title slide -#define PPT_LAYOUT_TITLEANDBODYSLIDE 1 // Title and body slide -#define PPT_LAYOUT_TITLEMASTERSLIDE 2 // Title master slide -#define PPT_LAYOUT_MASTERSLIDE 3 // Master slide layout -#define PPT_LAYOUT_MASTERNOTES 4 // Master notes layout -#define PPT_LAYOUT_NOTESTITLEBODY 5 // Notes title/body layout -#define PPT_LAYOUT_HANDOUTLAYOUT 6 // Handout layout, therefore it doesn't have placeholders except header, footer, and date -#define PPT_LAYOUT_ONLYTITLE 7 // Only title placeholder -#define PPT_LAYOUT_2COLUMNSANDTITLE 8 // Body of the slide has 2 columns and a title -#define PPT_LAYOUT_2ROWSANDTITLE 9 // Slide's body has 2 rows and a title -#define PPT_LAYOUT_RIGHTCOLUMN2ROWS 10 // Body contains 2 columns, right column has 2 rows -#define PPT_LAYOUT_LEFTCOLUMN2ROWS 11 // Body contains 2 columns, left column has 2 rows -#define PPT_LAYOUT_BOTTOMROW2COLUMNS 12 // Body contains 2 rows, bottom row has 2 columns -#define PPT_LAYOUT_TOPROW2COLUMN 13 // Body contains 2 rows, top row has 2 columns -#define PPT_LAYOUT_4OBJECTS 14 // 4 objects -#define PPT_LAYOUT_BIGOBJECT 15 // Big object -#define PPT_LAYOUT_BLANCSLIDE 16 // Blank slide -#define PPT_LAYOUT_TITLERIGHTBODYLEFT 17 // Vertical title on the right, body on the left -#define PPT_LAYOUT_TITLERIGHT2BODIESLEFT 18 // Vertical title on the right, body on the left split into 2 rows - -// the following table describes the placeholder id's (values from reality followed by values taken from the documentation) -#define PPT_PLACEHOLDER_NONE 0 // 0 None -#define PPT_PLACEHOLDER_MASTERTITLE 1 // 1 Master title -#define PPT_PLACEHOLDER_MASTERBODY 2 // 2 Master body -#define PPT_PLACEHOLDER_MASTERCENTEREDTITLE 3 // 3 Master centered title -#define PPT_PLACEHOLDER_MASTERSUBTITLE 4 // 10 Master subtitle -#define PPT_PLACEHOLDER_MASTERNOTESSLIDEIMAGE 5 // 4 Master notes slide image -#define PPT_PLACEHOLDER_MASTERNOTESBODYIMAGE 6 // 5 Master notes body image -#define PPT_PLACEHOLDER_MASTERDATE 7 // 6 Master date -#define PPT_PLACEHOLDER_MASTERSLIDENUMBER 8 // 7 Master slide number -#define PPT_PLACEHOLDER_MASTERFOOTER 9 // 8 Master footer -#define PPT_PLACEHOLDER_MASTERHEADER 10 // 9 Master header -#define PPT_PLACEHOLDER_GENERICTEXTOBJECT // 11 Generic text object -#define PPT_PLACEHOLDER_TITLE 13 // 12 Title -#define PPT_PLACEHOLDER_BODY 14 // 13 Body -#define PPT_PLACEHOLDER_NOTESBODY 12 // 14 Notes body -#define PPT_PLACEHOLDER_CENTEREDTITLE 15 // 15 Centered title -#define PPT_PLACEHOLDER_SUBTITLE 16 // 16 Subtitle -#define PPT_PLACEHOLDER_VERTICALTEXTTITLE 17 // 17 Vertical text title -#define PPT_PLACEHOLDER_VERTICALTEXTBODY 18 // 18 Vertical text body -#define PPT_PLACEHOLDER_NOTESSLIDEIMAGE 11 // 19 Notes slide image -#define PPT_PLACEHOLDER_OBJECT 19 // 20 Object (no matter the size) -#define PPT_PLACEHOLDER_GRAPH 20 // 21 Graph -#define PPT_PLACEHOLDER_TABLE 21 // 22 Table -#define PPT_PLACEHOLDER_CLIPART 22 // 23 Clip Art -#define PPT_PLACEHOLDER_ORGANISZATIONCHART 23 // 24 Organization Chart -#define PPT_PLACEHOLDER_MEDIACLIP 24 // 25 Media Clip - -//////////////////////////////////////////////////////////////////////////////////////////////////// - -#endif // SVX_LIGHT - -#endif //_SVDFPPT_HXX - diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx index 473802d7cf..0fd8967c1a 100644 --- a/svx/inc/svx/svdhdl.hxx +++ b/svx/inc/svx/svdhdl.hxx @@ -39,7 +39,7 @@ #include <tools/contnr.hxx> #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif #include <svx/xpoly.hxx> diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 56c0e8550e..7238b80915 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -40,12 +40,12 @@ #ifndef _MAPMOD_HXX //autogen #include <vcl/mapmod.hxx> #endif -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #include <tools/string.hxx> #include <tools/datetime.hxx> -#include <svtools/hint.hxx> +#include <svl/hint.hxx> -#include <svtools/style.hxx> +#include <svl/style.hxx> #include <svx/pageitem.hxx> #include <vcl/field.hxx> diff --git a/svx/inc/svx/svdobj.hxx b/svx/inc/svx/svdobj.hxx index 93bf3a1479..548d78a778 100644 --- a/svx/inc/svx/svdobj.hxx +++ b/svx/inc/svx/svdobj.hxx @@ -35,7 +35,7 @@ #include <cppuhelper/weakref.hxx> #include <vcl/mapmod.hxx> #include <tools/weakbase.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <vcl/timer.hxx> #include <svx/svdsob.hxx> #include <svx/svdtypes.hxx> // fuer SdrLayerID diff --git a/svx/inc/svx/svdpagv.hxx b/svx/inc/svx/svdpagv.hxx index 3aa7330a6f..81cd87a87d 100644 --- a/svx/inc/svx/svdpagv.hxx +++ b/svx/inc/svx/svdpagv.hxx @@ -32,7 +32,7 @@ #define _SVDPAGV_HXX #include <com/sun/star/awt/XControlContainer.hpp> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/svdhlpln.hxx> #include <cppuhelper/implbase4.hxx> #include <svx/svdsob.hxx> diff --git a/svx/inc/svx/svdpntv.hxx b/svx/inc/svx/svdpntv.hxx index 33fd3d0812..4620a13264 100644 --- a/svx/inc/svx/svdpntv.hxx +++ b/svx/inc/svx/svdpntv.hxx @@ -31,19 +31,20 @@ #ifndef _SVDPNTV_HXX #define _SVDPNTV_HXX -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/undo.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> +#include <svl/smplhint.hxx> +#include <svl/undo.hxx> #include <svx/svddrag.hxx> #include <svx/svdlayer.hxx> // fuer SetOfByte #include <vcl/window.hxx> #include <svtools/colorcfg.hxx> #include <com/sun/star/awt/XControlContainer.hpp> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <vcl/timer.hxx> #include "svx/svxdllapi.h" #include <svtools/optionsdrawinglayer.hxx> +#include <unotools/options.hxx> //************************************************************ // Pre-Defines @@ -127,7 +128,7 @@ typedef ::std::vector< SdrPaintWindow* > SdrPaintWindowVector; //////////////////////////////////////////////////////////////////////////////////////////////////// -class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster +class SVX_DLLPUBLIC SdrPaintView : public SfxListener, public SfxRepeatTarget, public SfxBroadcaster, public ::utl::ConfigurationListener { friend class SdrPageView; friend class FrameAnimator; @@ -241,6 +242,7 @@ protected: protected: void AppendPaintWindow(SdrPaintWindow& rNew); SdrPaintWindow* RemovePaintWindow(SdrPaintWindow& rOld); + void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ); public: sal_uInt32 PaintWindowCount() const { return maPaintWindows.size(); } diff --git a/svx/inc/svx/svdundo.hxx b/svx/inc/svx/svdundo.hxx index de73a88333..159e5c38ab 100644 --- a/svx/inc/svx/svdundo.hxx +++ b/svx/inc/svx/svdundo.hxx @@ -32,9 +32,9 @@ #define _SVDUNDO_HXX #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif -#include <svtools/undo.hxx> +#include <svl/undo.hxx> #include <tools/contnr.hxx> #include <tools/gen.hxx> #include <svx/svdtypes.hxx> // fuer enum RepeatFuncts diff --git a/svx/inc/svx/svdview.hxx b/svx/inc/svx/svdview.hxx index ecbdc32cb4..cfa5b648b1 100644 --- a/svx/inc/svx/svdview.hxx +++ b/svx/inc/svx/svdview.hxx @@ -38,6 +38,7 @@ #include <svtools/accessibilityoptions.hxx> #include "svx/svxdllapi.h" #include <svx/svdcrtv.hxx> +#include <unotools/options.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// // @@ -197,8 +198,6 @@ class SVX_DLLPUBLIC SdrView: public SdrCreateView, public tools::WeakBase< SdrVi protected: SvtAccessibilityOptions maAccessibilityOptions; - virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint); - public: TYPEINFO(); SdrView(SdrModel* pModel1, OutputDevice* pOut = 0L); @@ -235,6 +234,8 @@ public: virtual BOOL MouseMove(const MouseEvent& rMEvt, Window* pWin); virtual BOOL Command(const CommandEvent& rCEvt, Window* pWin); + virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); + BOOL SetAttributes(const SfxItemSet& rSet, BOOL bReplaceAll=FALSE) { return SdrCreateView::SetAttributes(rSet,bReplaceAll); } BOOL SetStyleSheet(SfxStyleSheet* pStyleSheet, BOOL bDontRemoveHardAttr=FALSE) { return SdrCreateView::SetStyleSheet(pStyleSheet,bDontRemoveHardAttr); } diff --git a/svx/inc/svx/svx3ditems.hxx b/svx/inc/svx/svx3ditems.hxx index a9ea7d22b1..2bff30ee10 100644 --- a/svx/inc/svx/svx3ditems.hxx +++ b/svx/inc/svx/svx3ditems.hxx @@ -30,8 +30,8 @@ #ifndef _SVX3DITEMS_HXX #define _SVX3DITEMS_HXX -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> #include <svx/colritem.hxx> diff --git a/svx/inc/svx/svxacorr.hxx b/svx/inc/svx/svxacorr.hxx index 0651f7cd7d..26d34abb10 100644 --- a/svx/inc/svx/svxacorr.hxx +++ b/svx/inc/svx/svxacorr.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/embed/XStorage.hpp> #include <tools/rtti.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <i18npool/lang.h> #include <tools/time.hxx> #include <tools/date.hxx> diff --git a/svx/inc/svx/svxbox.hxx b/svx/inc/svx/svxbox.hxx index 335ecd3373..7f1c8aaa75 100644 --- a/svx/inc/svx/svxbox.hxx +++ b/svx/inc/svx/svxbox.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <tools/string.hxx> #ifndef _LSTBOX_HXX //autogen diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index 613d5752f5..2e040b6de2 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -361,56 +361,47 @@ class SVX_DLLPUBLIC SvxAbstractDialogFactory : public SfxAbstractDialogFactory public: static SvxAbstractDialogFactory* Create(); + // define dtor as this will create typeinfo in svx library + virtual ~SvxAbstractDialogFactory(); + virtual SfxAbstractTabDialog* CreateTextTabDialog( Window* pParent, const SfxItemSet* pAttrSet, - sal_uInt32 nResId, SdrView* pView, SdrModel* pModel=0 ) = 0 ; //add for SvxTextTabDialog virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent, const SdrView* pView, - sal_uInt32 nResId, USHORT nAnchorTypes = 0 ) = 0; //add for SvxCaptionTabDialog CHINA001 virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent, const SfxItemSet& rAttr, - sal_uInt32 nResId, SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone, SvxDistributeVertical eVer = SvxDistributeVerticalNone)= 0; virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001 - HangulHanjaConversion::ConversionDirection _ePrimaryDirection, - sal_uInt32 nResId) = 0; - - virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent, //add for FmShowColsDialog - sal_uInt32 nResId) = 0 ; + HangulHanjaConversion::ConversionDirection _ePrimaryDirection ) = 0; + virtual AbstractFmShowColsDialog * CreateFmShowColsDialog( Window* pParent ) = 0; + virtual AbstractSvxZoomDialog * CreateSvxZoomDialog( Window* pParent, //add for SvxZoomDialog - const SfxItemSet& rCoreSet, - sal_uInt32 nResId) = 0 ; + const SfxItemSet& rCoreSet )=0; virtual AbstractSpellDialog * CreateSvxSpellDialog(Window* pParent, SfxBindings* pBindings, svx::SpellDialogChildWindow* pSpellChildWindow )=0; virtual VclAbstractRefreshableDialog * CreateActualizeProgressDialog( Window* pParent, //add for ActualizeProgress - GalleryTheme* pThm, - sal_uInt32 nResId) = 0; + GalleryTheme* pThm ) = 0; virtual AbstractSearchProgress * CreateSearchProgressDialog( Window* pParent, //add for SearchProgress - const INetURLObject& rStartURL, - sal_uInt32 nResId) = 0; - virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent, //add for TakeProgress - sal_uInt32 nResId) = 0; + const INetURLObject& rStartURL ) = 0; + virtual AbstractTakeProgress * CreateTakeProgressDialog( Window* pParent ) = 0; virtual AbstractTitleDialog * CreateTitleDialog( Window* pParent, //add for TitleDialog - const String& rOldText, - sal_uInt32 nResId) = 0; + const String& rOldText ) = 0; virtual AbstractGalleryIdDialog * CreateGalleryIdDialog( Window* pParent, //add for SvxZoomDialog - GalleryTheme* pThm, - sal_uInt32 nResId) = 0; + GalleryTheme* pThm ) = 0; virtual VclAbstractDialog2 * CreateGalleryThemePropertiesDialog( Window* pParent, //add for GalleryThemeProperties ExchangeData* pData, - SfxItemSet* pItemSet, - sal_uInt32 nResId) = 0; + SfxItemSet* pItemSet ) = 0; virtual AbstractURLDlg * CreateURLDialog( Window* pParent, const String& rURL, const String& rAltText, const String& rDescription, const String& rTarget, const String& rName, @@ -422,8 +413,7 @@ public: sal_uInt32 nResId) = 0; virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent, //add for SvxSearchAttributeDialog SearchAttrItemList& rLst, - const USHORT* pWhRanges, - sal_uInt32 nResId )= 0; + const USHORT* pWhRanges)=0; virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent, //add for SvxSearchSimilarityDialog BOOL bRelax, USHORT nOther, @@ -431,12 +421,10 @@ public: USHORT nLonger ) = 0; virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg const SfxItemSet& rCoreSet, - sal_uInt32 nResId, BOOL bEnableSelector = FALSE) = 0; virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog const SfxItemSet* pAttr, const SdrView* pView, - sal_uInt32 nResId, USHORT nAnchorTypes = 0) = 0; virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog const SfxItemSet* pAttr, @@ -445,11 +433,9 @@ public: bool bSizeTabPage = false )=0; virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent, - const SfxItemSet& rOptionsSet, USHORT nUniqueId, - INT32 nInitialFlags, - sal_uInt32 nResId) = 0; //add for SvxJSearchOptionsDialog - virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent, - sal_uInt32 nResId) = 0; //add for FmInputRecordNoDialog + const SfxItemSet& rOptionsSet, + INT32 nInitialFlags )=0; + virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent ) = 0; virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent, ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl, sal_uInt32 nResId ) = 0; //add for SvxNewDictionaryDialog @@ -458,21 +444,18 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1> &xSpl, sal_uInt32 nResId) = 0;//add for SvxEditDictionaryDialog virtual AbstractSvxNameDialog * CreateSvxNameDialog( Window* pParent, - const String& rName, const String& rDesc, - sal_uInt32 nResId ) = 0; //add for SvxNameDialog + const String& rName, const String& rDesc ) = 0; //add for SvxNameDialog // #i68101# - virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName, sal_uInt32 nResId) = 0; - virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription, sal_uInt32 nResId) = 0; + virtual AbstractSvxObjectNameDialog* CreateSvxObjectNameDialog(Window* pParent, const String& rName ) = 0; + virtual AbstractSvxObjectTitleDescDialog* CreateSvxObjectTitleDescDialog(Window* pParent, const String& rTitle, const String& rDescription) = 0; virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId, const String& rText, const String& rDesc, Image* pImg = NULL ) = 0; //add for SvxMessDialog - virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_uInt32 nResId, - BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog - virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_uInt32 nResId, - BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog + virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiPathDialog + virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ) = 0 ; //add for SvxMultiFileDialog virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxMultiFileDialog SfxBindings* pBindings, sal_uInt32 nResId)=0; @@ -483,28 +466,23 @@ public: const Link& lnkContextSupplier)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterEmboss (Window* pParent, //add for GraphicFilterEmboss const Graphic& rGraphic, - RECT_POINT eLightSource, - sal_uInt32 nResId)=0; + RECT_POINT eLightSource, sal_uInt32 nResId )=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia const Graphic& rGraphic, USHORT nCount, sal_uInt32 nResId)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize const Graphic& rGraphic, - BYTE nGreyThreshold, BOOL bInvert, - sal_uInt32 nResId)=0; + BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId)=0; virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic const Graphic& rGraphic, - USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, - sal_uInt32 nResId)=0; + USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId)=0; virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog const SfxItemSet* pAttr, SdrModel* pModel, - sal_uInt32 nResId, const SdrView* pSdrView = NULL ) = 0 ; virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog SdrModel* pModel, - sal_uInt32 nResId, const SdrObject* pObj = NULL, BOOL bHasObj = TRUE )=0; virtual VclAbstractDialog* CreateSfxDialog( Window* pParent, const SfxBindings& rBindings, sal_uInt32 nResId ) = 0; @@ -520,11 +498,10 @@ public: )=0; virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog const SfxItemSet& rCoreSet, - sal_uInt32 nResId, BOOL bPrevNext = FALSE, BOOL bRedline = FALSE )=0; virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage ) = 0; - virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc(USHORT nId ) = 0; // add for SvxDistributePage + virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc() = 0; // add for SvxDistributePage virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ) = 0; //add for SvxPostItDialog virtual AbstractScriptSelectorDialog* diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index 4d8f48af85..4bf16135aa 100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc @@ -31,8 +31,8 @@ #define _SVX_SVXIDS_HRC // include ------------------------------------------------------------------ -#include <svtools/memberid.hrc> -#include <svtools/solar.hrc> +#include <svl/memberid.hrc> +#include <svl/solar.hrc> #include <sfx2/sfx.hrc> #include <sfx2/sfxsids.hrc> @@ -147,7 +147,7 @@ // -------------------------------------------------------------------------- // Resource-Id's ? (obsolete??? at least the one beginning with SID???) // -------------------------------------------------------------------------- - +/* #define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255) #define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206) #define RID_SW_TP_LAYOUT_OPT (RID_OFA_START + 207) @@ -196,8 +196,9 @@ #define RID_OFA_TP_INTERNATIONAL (RID_OFA_START + 252) // 4 SC & ID 4 resource #define RID_OFA_TP_INTERNATIONAL_SD (RID_OFA_START + 253) // 4 SD #define RID_OFA_TP_INTERNATIONAL_IMPR (RID_OFA_START + 254) // 4 impress +*/ + #define SID_ATTR_PARENTWINDOW (RID_OFA_START + 255) -#define RID_SW_TP_OPTCAPTION_PAGE (RID_OFA_START + 256) // -------------------------------------------------------------------------- // Event-Id's Block 1 diff --git a/svx/inc/svx/svxitems.hrc b/svx/inc/svx/svxitems.hrc index 8974d9f29a..8800b7cb46 100644 --- a/svx/inc/svx/svxitems.hrc +++ b/svx/inc/svx/svxitems.hrc @@ -33,7 +33,7 @@ // include ------------------------------------------------------------------ #ifndef _SOLAR_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #endif // BOOL --------------------------------------------------------------------- diff --git a/svx/inc/svx/sxcecitm.hxx b/svx/inc/svx/sxcecitm.hxx index 78ab0344d4..36c481d267 100644 --- a/svx/inc/svx/sxcecitm.hxx +++ b/svx/inc/svx/sxcecitm.hxx @@ -30,7 +30,7 @@ #ifndef _SXCECITM_HXX #define _SXCECITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include <svx/sdynitm.hxx> #include <svx/sdmetitm.hxx> diff --git a/svx/inc/svx/sxcikitm.hxx b/svx/inc/svx/sxcikitm.hxx index bb051652a4..daeebaac51 100644 --- a/svx/inc/svx/sxcikitm.hxx +++ b/svx/inc/svx/sxcikitm.hxx @@ -31,7 +31,7 @@ #define _SXCIKITM_HXX #include <svx/svddef.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> enum SdrCircKind {SDRCIRC_FULL, SDRCIRC_SECT, diff --git a/svx/inc/svx/sxctitm.hxx b/svx/inc/svx/sxctitm.hxx index 9c11b8b112..ad7916e8a3 100644 --- a/svx/inc/svx/sxctitm.hxx +++ b/svx/inc/svx/sxctitm.hxx @@ -30,7 +30,7 @@ #ifndef _SXCTITM_HXX #define _SXCTITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sxekitm.hxx b/svx/inc/svx/sxekitm.hxx index 8157d4cc79..a0faab3317 100644 --- a/svx/inc/svx/sxekitm.hxx +++ b/svx/inc/svx/sxekitm.hxx @@ -30,7 +30,7 @@ #ifndef _SXEKITM_HXX #define _SXEKITM_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/sxfiitm.hxx b/svx/inc/svx/sxfiitm.hxx index ab8e35de0e..0095b40d85 100644 --- a/svx/inc/svx/sxfiitm.hxx +++ b/svx/inc/svx/sxfiitm.hxx @@ -30,7 +30,7 @@ #ifndef _SFXIITM_HXX #define _SFXIITM_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/fract.hxx> /*************************************************************************/ diff --git a/svx/inc/svx/sxlayitm.hxx b/svx/inc/svx/sxlayitm.hxx index 3f86b5e899..2dfa5fb3d6 100644 --- a/svx/inc/svx/sxlayitm.hxx +++ b/svx/inc/svx/sxlayitm.hxx @@ -31,8 +31,8 @@ #define _SYLAYITM_HXX #include <svx/svddef.hxx> -#include <svtools/stritem.hxx> -#include <svtools/intitem.hxx> +#include <svl/stritem.hxx> +#include <svl/intitem.hxx> #include <svx/svdtypes.hxx> //------------------------------ diff --git a/svx/inc/svx/sxmfsitm.hxx b/svx/inc/svx/sxmfsitm.hxx index 2fbce30fb7..eb972d4148 100644 --- a/svx/inc/svx/sxmfsitm.hxx +++ b/svx/inc/svx/sxmfsitm.hxx @@ -31,7 +31,7 @@ #define _SXMFSITM_HXX #include <svx/svddef.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> // Formatstring (aehnl. Calc), z.B. "#.###,00km" // ueberschreibt SdrMeasureUnitItem und SdrMeasureShowUnitItem (n.i.) diff --git a/svx/inc/svx/sxmkitm.hxx b/svx/inc/svx/sxmkitm.hxx index 1ecd7c317b..eae1cf6926 100644 --- a/svx/inc/svx/sxmkitm.hxx +++ b/svx/inc/svx/sxmkitm.hxx @@ -31,7 +31,7 @@ #define _SXMKITM_HXX #include <svx/svddef.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> enum SdrMeasureKind {SDRMEASURE_STD,SDRMEASURE_RADIUS}; // n.i. diff --git a/svx/inc/svx/sxmtpitm.hxx b/svx/inc/svx/sxmtpitm.hxx index 373396588c..efe8d8f9ff 100644 --- a/svx/inc/svx/sxmtpitm.hxx +++ b/svx/inc/svx/sxmtpitm.hxx @@ -31,7 +31,7 @@ #define _SXMTPITM_HXX #include <svx/svddef.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" enum SdrMeasureTextHPos {SDRMEASURE_TEXTHAUTO,SDRMEASURE_TEXTLEFTOUTSIDE,SDRMEASURE_TEXTINSIDE,SDRMEASURE_TEXTRIGHTOUTSIDE}; diff --git a/svx/inc/svx/sxmuitm.hxx b/svx/inc/svx/sxmuitm.hxx index 6e907000cc..e3112f0c56 100644 --- a/svx/inc/svx/sxmuitm.hxx +++ b/svx/inc/svx/sxmuitm.hxx @@ -32,7 +32,7 @@ #include <vcl/field.hxx> #include <svx/svddef.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" // Vorgabe einer Masseinheit. Der Zahlenwert wird in diese Einheit umgerechnet diff --git a/svx/inc/svx/sxonitm.hxx b/svx/inc/svx/sxonitm.hxx index d19bc696af..b335886b9e 100644 --- a/svx/inc/svx/sxonitm.hxx +++ b/svx/inc/svx/sxonitm.hxx @@ -31,7 +31,7 @@ #define _SXONITM_HXX #include <svx/svddef.hxx> -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> //------------------------------ // class SdrObjectNameItem diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index 0a8a3a0cec..267b0adb69 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -158,7 +158,7 @@ // ITEMID_...-Defines im *.cxx #include <rsc/rscsfx.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <sfx2/tbxctrl.hxx> #include <svx/strarray.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/tstpitem.hxx b/svx/inc/svx/tstpitem.hxx index 1e4dc79301..edd17a9ac6 100644 --- a/svx/inc/svx/tstpitem.hxx +++ b/svx/inc/svx/tstpitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <svx/svxenum.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/twolinesitem.hxx b/svx/inc/svx/twolinesitem.hxx index aeb65776ab..67417ac88c 100644 --- a/svx/inc/svx/twolinesitem.hxx +++ b/svx/inc/svx/twolinesitem.hxx @@ -31,7 +31,7 @@ #define _SVX_TWOLINESITEM_HXX #include <sal/types.h> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/udlnitem.hxx b/svx/inc/svx/udlnitem.hxx index d46f51322f..d5b328361a 100644 --- a/svx/inc/svx/udlnitem.hxx +++ b/svx/inc/svx/udlnitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/ulspitem.hxx b/svx/inc/svx/ulspitem.hxx index 32f546955b..87d2262b76 100644 --- a/svx/inc/svx/ulspitem.hxx +++ b/svx/inc/svx/ulspitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/unoedsrc.hxx b/svx/inc/svx/unoedsrc.hxx index b6601ff93a..b60ec2d586 100644 --- a/svx/inc/svx/unoedsrc.hxx +++ b/svx/inc/svx/unoedsrc.hxx @@ -42,8 +42,8 @@ #ifndef _SV_COLOR_HXX //autogen #include <tools/color.hxx> #endif -#include <svtools/poolitem.hxx> -#include <svtools/itempool.hxx> +#include <svl/poolitem.hxx> +#include <svl/itempool.hxx> #include "svx/svxdllapi.h" #include <list> diff --git a/svx/inc/svx/unoipset.hxx b/svx/inc/svx/unoipset.hxx index d0985f2b66..96b11fda51 100644 --- a/svx/inc/svx/unoipset.hxx +++ b/svx/inc/svx/unoipset.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include "svx/svxdllapi.h" -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> class SvxIDPropertyCombineList; class SdrItemPool; diff --git a/svx/inc/svx/unopage.hxx b/svx/inc/svx/unopage.hxx index 9d59807ce0..a84360ccb8 100644 --- a/svx/inc/svx/unopage.hxx +++ b/svx/inc/svx/unopage.hxx @@ -44,7 +44,7 @@ #endif #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/mutxhelp.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/unoprov.hxx b/svx/inc/svx/unoprov.hxx index fcef2c605b..98156d5d25 100644 --- a/svx/inc/svx/unoprov.hxx +++ b/svx/inc/svx/unoprov.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <svx/svdpool.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <tools/list.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/unoshape.hxx b/svx/inc/svx/unoshape.hxx index e516b1bc8f..fd95b762dc 100644 --- a/svx/inc/svx/unoshape.hxx +++ b/svx/inc/svx/unoshape.hxx @@ -49,7 +49,7 @@ #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <tools/gen.hxx> #include <tools/weakbase.hxx> -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> #include <svx/unoipset.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> diff --git a/svx/inc/svx/unoshprp.hxx b/svx/inc/svx/unoshprp.hxx index 7366f1acf0..73c4c45bf4 100644 --- a/svx/inc/svx/unoshprp.hxx +++ b/svx/inc/svx/unoshprp.hxx @@ -82,7 +82,7 @@ #include <svx/unoprnms.hxx> #include <svx/unomid.hxx> #include <svx/unotext.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <svx/svxids.hrc> diff --git a/svx/inc/svx/unotext.hxx b/svx/inc/svx/unotext.hxx index fb06d47343..da5c79c2ed 100644 --- a/svx/inc/svx/unotext.hxx +++ b/svx/inc/svx/unotext.hxx @@ -50,11 +50,11 @@ #include <com/sun/star/text/XTextCopy.hpp> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> -#include <svtools/itemprop.hxx> +#include <svl/itemprop.hxx> #include <svx/editdata.hxx> #include <svx/unoedsrc.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> #include <svx/svxenum.hxx> #include <svx/outliner.hxx> #include <svx/unoforou.hxx> diff --git a/svx/inc/svx/viewlayoutitem.hxx b/svx/inc/svx/viewlayoutitem.hxx index 97d1b9349f..563bd01abd 100644 --- a/svx/inc/svx/viewlayoutitem.hxx +++ b/svx/inc/svx/viewlayoutitem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_VIEWLAYOUTITEM_HXX #define _SVX_VIEWLAYOUTITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/wghtitem.hxx b/svx/inc/svx/wghtitem.hxx index 93575b270e..513a56822f 100644 --- a/svx/inc/svx/wghtitem.hxx +++ b/svx/inc/svx/wghtitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <vcl/vclenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/widwitem.hxx b/svx/inc/svx/widwitem.hxx index fe553574bd..f63cfbc48c 100644 --- a/svx/inc/svx/widwitem.hxx +++ b/svx/inc/svx/widwitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> diff --git a/svx/inc/svx/writingmodeitem.hxx b/svx/inc/svx/writingmodeitem.hxx index 0f320b9612..27885c61ad 100644 --- a/svx/inc/svx/writingmodeitem.hxx +++ b/svx/inc/svx/writingmodeitem.hxx @@ -33,7 +33,7 @@ // include --------------------------------------------------------------- #include <com/sun/star/text/WritingMode.hpp> -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <svx/svddef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/wrlmitem.hxx b/svx/inc/svx/wrlmitem.hxx index ded8976ca4..6807b47999 100644 --- a/svx/inc/svx/wrlmitem.hxx +++ b/svx/inc/svx/wrlmitem.hxx @@ -32,7 +32,7 @@ // include --------------------------------------------------------------- -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/xfillit.hxx b/svx/inc/svx/xfillit.hxx index 2b50f9d309..8ba3e394e5 100644 --- a/svx/inc/svx/xfillit.hxx +++ b/svx/inc/svx/xfillit.hxx @@ -38,7 +38,7 @@ #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> #include <svx/xenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/xflclit.hxx> #include <svx/xsflclit.hxx> diff --git a/svx/inc/svx/xfillit0.hxx b/svx/inc/svx/xfillit0.hxx index 59a9dff68d..ffb69ae225 100644 --- a/svx/inc/svx/xfillit0.hxx +++ b/svx/inc/svx/xfillit0.hxx @@ -31,7 +31,7 @@ #ifndef SVX_XFILLIT0_HXX #define SVX_XFILLIT0_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include <svx/xdef.hxx> #include <svx/xenum.hxx> diff --git a/svx/inc/svx/xflasit.hxx b/svx/inc/svx/xflasit.hxx index 2742542bac..73c3e43329 100644 --- a/svx/inc/svx/xflasit.hxx +++ b/svx/inc/svx/xflasit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLASIT_HXX #define _SVX_XFLASIT_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbckit.hxx b/svx/inc/svx/xflbckit.hxx index ff4e898c29..f192de55be 100644 --- a/svx/inc/svx/xflbckit.hxx +++ b/svx/inc/svx/xflbckit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBCKIT_HXX #define _SVX_XFLBCKIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmpit.hxx b/svx/inc/svx/xflbmpit.hxx index e4b5174e90..4766860a7a 100644 --- a/svx/inc/svx/xflbmpit.hxx +++ b/svx/inc/svx/xflbmpit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMPIT_HXX #define _SVX_XFLBMPIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmsli.hxx b/svx/inc/svx/xflbmsli.hxx index eb22a47016..4fbfda9dec 100644 --- a/svx/inc/svx/xflbmsli.hxx +++ b/svx/inc/svx/xflbmsli.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMSLI_HXX #define _SVX_XFLBMSLI_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmsxy.hxx b/svx/inc/svx/xflbmsxy.hxx index 39eabd4d41..fbd0885750 100644 --- a/svx/inc/svx/xflbmsxy.hxx +++ b/svx/inc/svx/xflbmsxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMSXY_HXX #define _SVX_XFLBMSXY_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbmtit.hxx b/svx/inc/svx/xflbmtit.hxx index 0aee56400d..747a999b95 100644 --- a/svx/inc/svx/xflbmtit.hxx +++ b/svx/inc/svx/xflbmtit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBMTIT_HXX #define _SVX_XFLBMTIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflboxy.hxx b/svx/inc/svx/xflboxy.hxx index 1d1d8d5eb5..a912b4348b 100644 --- a/svx/inc/svx/xflboxy.hxx +++ b/svx/inc/svx/xflboxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBOXY_HXX #define _SVX_XFLBOXY_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbstit.hxx b/svx/inc/svx/xflbstit.hxx index ba2159d7c0..627a5e4969 100644 --- a/svx/inc/svx/xflbstit.hxx +++ b/svx/inc/svx/xflbstit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBSTIT_HXX #define _SVX_XFLBSTIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xflbtoxy.hxx b/svx/inc/svx/xflbtoxy.hxx index 83b283ea77..63fa08c7d5 100644 --- a/svx/inc/svx/xflbtoxy.hxx +++ b/svx/inc/svx/xflbtoxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLBTOXY_HXX #define _SVX_XFLBTOXY_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xfltrit.hxx b/svx/inc/svx/xfltrit.hxx index 582cc0f6ac..ae0d5ab995 100644 --- a/svx/inc/svx/xfltrit.hxx +++ b/svx/inc/svx/xfltrit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFLTRIT_HXX #define _SVX_XFLTRIT_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftadit.hxx b/svx/inc/svx/xftadit.hxx index c50514ff0d..1ed03ddb9c 100644 --- a/svx/inc/svx/xftadit.hxx +++ b/svx/inc/svx/xftadit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTADIT_HXX #define _SVX_XFTADIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftdiit.hxx b/svx/inc/svx/xftdiit.hxx index 56c234a549..71373c9fdf 100644 --- a/svx/inc/svx/xftdiit.hxx +++ b/svx/inc/svx/xftdiit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTDIIT_HXX #define _SVX_XFTDIIT_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftmrit.hxx b/svx/inc/svx/xftmrit.hxx index 040e347de5..c06e1ae718 100644 --- a/svx/inc/svx/xftmrit.hxx +++ b/svx/inc/svx/xftmrit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTMRIT_HXX #define _SVX_XFTMRIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftshit.hxx b/svx/inc/svx/xftshit.hxx index 87fe4d5457..cb706080e9 100644 --- a/svx/inc/svx/xftshit.hxx +++ b/svx/inc/svx/xftshit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSHIT_HXX #define _SVX_XFTSHIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftshtit.hxx b/svx/inc/svx/xftshtit.hxx index fbbdc09769..57af63d210 100644 --- a/svx/inc/svx/xftshtit.hxx +++ b/svx/inc/svx/xftshtit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSHTIT_HXX #define _SVX_XFTSHTIT_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> /************************************************************************* |* diff --git a/svx/inc/svx/xftshxy.hxx b/svx/inc/svx/xftshxy.hxx index f085f31ff6..87b35afccc 100644 --- a/svx/inc/svx/xftshxy.hxx +++ b/svx/inc/svx/xftshxy.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSHXY_HXX #define _SVX_XFTSHXY_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xftstit.hxx b/svx/inc/svx/xftstit.hxx index d4630827e4..4c8693e69c 100644 --- a/svx/inc/svx/xftstit.hxx +++ b/svx/inc/svx/xftstit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XFTSTIT_HXX #define _SVX_XFTSTIT_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xgrscit.hxx b/svx/inc/svx/xgrscit.hxx index c98573cb02..98a79b0f2f 100644 --- a/svx/inc/svx/xgrscit.hxx +++ b/svx/inc/svx/xgrscit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XGRSCIT_HXX #define _SVX_XGRSCIT_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xit.hxx b/svx/inc/svx/xit.hxx index 35b78558aa..59d7d131b6 100644 --- a/svx/inc/svx/xit.hxx +++ b/svx/inc/svx/xit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XIT_HXX #define _SVX_XIT_HXX -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> #include <svx/xdef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/xlineit.hxx b/svx/inc/svx/xlineit.hxx index acaad7220c..74d3c447ff 100644 --- a/svx/inc/svx/xlineit.hxx +++ b/svx/inc/svx/xlineit.hxx @@ -35,8 +35,8 @@ #include <svx/xcolit.hxx> #include <svx/xpoly.hxx> #include <svx/xenum.hxx> -#include <svtools/metitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/metitem.hxx> +#include <svl/eitem.hxx> class XDash; class XDashTable; diff --git a/svx/inc/svx/xlineit0.hxx b/svx/inc/svx/xlineit0.hxx index 9b9f1a8d97..db58c3a070 100644 --- a/svx/inc/svx/xlineit0.hxx +++ b/svx/inc/svx/xlineit0.hxx @@ -32,7 +32,7 @@ #define _SVX_XLINEIT0_HXX #include <svx/xenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> //--------------------- // class LineStyleItem //--------------------- diff --git a/svx/inc/svx/xlinjoit.hxx b/svx/inc/svx/xlinjoit.hxx new file mode 100644 index 0000000000..d94f1fbbb5 --- /dev/null +++ b/svx/inc/svx/xlinjoit.hxx @@ -0,0 +1,63 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2008 by Sun Microsystems, Inc. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * $RCSfile: xlinjoit.hxx,v $ + * $Revision: 1.6 $ + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef _SVX_XLINJOIT_HXX +#define _SVX_XLINJOIT_HXX + +#include <svl/eitem.hxx> +#include <svx/xenum.hxx> +#include "svx/svxdllapi.h" + +//--------------------- +// class LineStyleItem +//--------------------- + +class SVX_DLLPUBLIC XLineJointItem : public SfxEnumItem +{ +public: + TYPEINFO(); + XLineJointItem( XLineJoint eLineJoint = XLINEJOINT_ROUND ); + XLineJointItem( SvStream& rIn ); + + virtual USHORT GetVersion( USHORT nFileFormatVersion ) const; + virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; + virtual SfxPoolItem* Create( SvStream& rIn, USHORT nVer ) const; + + virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const; + virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ); + virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, + SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, + String &rText, const IntlWrapper * = 0 ) const; + + virtual USHORT GetValueCount() const; + XLineJoint GetValue() const { return (XLineJoint) SfxEnumItem::GetValue(); } +}; + +#endif // _SVX_XLINJOIT_HXX diff --git a/svx/inc/svx/xlnasit.hxx b/svx/inc/svx/xlnasit.hxx index ce755f4e1c..7d72bbaef5 100644 --- a/svx/inc/svx/xlnasit.hxx +++ b/svx/inc/svx/xlnasit.hxx @@ -32,7 +32,7 @@ #define _SVX_XLNASIT_HXX -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xlnedcit.hxx b/svx/inc/svx/xlnedcit.hxx index 5b8d309739..3af01e45c4 100644 --- a/svx/inc/svx/xlnedcit.hxx +++ b/svx/inc/svx/xlnedcit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNEDCIT_HXX #define _SVX_XLNEDCIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" //---------------------------- diff --git a/svx/inc/svx/xlnedwit.hxx b/svx/inc/svx/xlnedwit.hxx index 50cda7eb59..11d56f5fd8 100644 --- a/svx/inc/svx/xlnedwit.hxx +++ b/svx/inc/svx/xlnedwit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNEDWIT_HXX #define _SVX_XLNEDWIT_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" #define LINE_END_WIDTH_DEFAULT (200) diff --git a/svx/inc/svx/xlnstcit.hxx b/svx/inc/svx/xlnstcit.hxx index 5976c7d35f..c4805a413c 100644 --- a/svx/inc/svx/xlnstcit.hxx +++ b/svx/inc/svx/xlnstcit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNSTCIT_HXX #define _SVX_XLNSTCIT_HXX -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" //------------------------------ diff --git a/svx/inc/svx/xlnstwit.hxx b/svx/inc/svx/xlnstwit.hxx index a9b900a230..be49f3c470 100644 --- a/svx/inc/svx/xlnstwit.hxx +++ b/svx/inc/svx/xlnstwit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNSTWIT_HXX #define _SVX_XLNSTWIT_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" #define LINE_START_WIDTH_DEFAULT (200) diff --git a/svx/inc/svx/xlntrit.hxx b/svx/inc/svx/xlntrit.hxx index e11ea53c74..33d96c1852 100644 --- a/svx/inc/svx/xlntrit.hxx +++ b/svx/inc/svx/xlntrit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNTRIT_HXX #define _SVX_XLNTRIT_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/xlnwtit.hxx b/svx/inc/svx/xlnwtit.hxx index f55bbd6e3e..b89182723f 100644 --- a/svx/inc/svx/xlnwtit.hxx +++ b/svx/inc/svx/xlnwtit.hxx @@ -31,7 +31,7 @@ #ifndef _SVX_XLNWTIT_HXX #define _SVX_XLNWTIT_HXX -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> #include "svx/svxdllapi.h" //--------------------- diff --git a/svx/inc/svx/xpool.hxx b/svx/inc/svx/xpool.hxx index 58cf4bea94..7bf94b7ad9 100644 --- a/svx/inc/svx/xpool.hxx +++ b/svx/inc/svx/xpool.hxx @@ -31,7 +31,7 @@ #ifndef _XPOOL_HXX #define _XPOOL_HXX -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include <svx/xdef.hxx> #include "svx/svxdllapi.h" diff --git a/svx/inc/svx/xsetit.hxx b/svx/inc/svx/xsetit.hxx index 044cff3805..3bdd30c3d9 100644 --- a/svx/inc/svx/xsetit.hxx +++ b/svx/inc/svx/xsetit.hxx @@ -34,8 +34,8 @@ #ifndef _XATTR_HXX #include <svx/xit.hxx> #endif -#include <svtools/metitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/metitem.hxx> +#include <svl/eitem.hxx> #include <svx/rectenum.hxx> #include <svx/xlnasit.hxx> diff --git a/svx/inc/svx/xtextit.hxx b/svx/inc/svx/xtextit.hxx index b72d237b28..0350140910 100644 --- a/svx/inc/svx/xtextit.hxx +++ b/svx/inc/svx/xtextit.hxx @@ -32,8 +32,8 @@ #define _SVX_XTEXTITEM_HXX #include <svx/xenum.hxx> -#include <svtools/metitem.hxx> -#include <svtools/eitem.hxx> +#include <svl/metitem.hxx> +#include <svl/eitem.hxx> #include <svx/xit.hxx> #include <svx/xcolit.hxx> diff --git a/svx/inc/svx/xtextit0.hxx b/svx/inc/svx/xtextit0.hxx index 627a93f054..d3921e7a9a 100644 --- a/svx/inc/svx/xtextit0.hxx +++ b/svx/inc/svx/xtextit0.hxx @@ -32,7 +32,7 @@ #define _SVX_TEXTIT0_HXX #include <svx/xenum.hxx> -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> #include "svx/svxdllapi.h" /************************************************************************* diff --git a/svx/inc/svx/zoomitem.hxx b/svx/inc/svx/zoomitem.hxx index e5c00cba79..311eb4a058 100644 --- a/svx/inc/svx/zoomitem.hxx +++ b/svx/inc/svx/zoomitem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_ZOOMITEM_HXX #define _SVX_ZOOMITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif diff --git a/svx/inc/svx/zoomslideritem.hxx b/svx/inc/svx/zoomslideritem.hxx index 35caf4059b..9ba2a52684 100644 --- a/svx/inc/svx/zoomslideritem.hxx +++ b/svx/inc/svx/zoomslideritem.hxx @@ -30,7 +30,7 @@ #ifndef _SVX_ZOOMSLIDERITEM_HXX #define _SVX_ZOOMSLIDERITEM_HXX -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> #endif |