diff options
Diffstat (limited to 'sd/source/filter/html')
| -rw-r--r-- | sd/source/filter/html/HtmlOptionsDialog.cxx | 6 | ||||
| -rw-r--r-- | sd/source/filter/html/buttonset.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/html/buttonset.hxx | 4 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlattr.cxx | 2 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlattr.hxx | 8 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 82 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlex.hxx | 108 | ||||
| -rw-r--r-- | sd/source/filter/html/pubdlg.cxx | 164 | ||||
| -rw-r--r-- | sd/source/filter/html/pubdlg.src | 4 | ||||
| -rw-r--r-- | sd/source/filter/html/sdhtmlfilter.cxx | 2 |
10 files changed, 191 insertions, 191 deletions
diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx b/sd/source/filter/html/HtmlOptionsDialog.cxx index 468a5f07fd8c..c754c8d05550 100644 --- a/sd/source/filter/html/HtmlOptionsDialog.cxx +++ b/sd/source/filter/html/HtmlOptionsDialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -144,8 +144,8 @@ Sequence< ::rtl::OUString > SAL_CALL SdHtmlOptionsDialog_getSupportedServiceName // ----------------------------------------------------------------------------- SdHtmlOptionsDialog::SdHtmlOptionsDialog( const Reference< XMultiServiceFactory > & xMgr ) : - mrxMgr ( xMgr ), - meDocType ( DOCUMENT_TYPE_DRAW ) + mrxMgr ( xMgr ), + meDocType ( DOCUMENT_TYPE_DRAW ) { } diff --git a/sd/source/filter/html/buttonset.cxx b/sd/source/filter/html/buttonset.cxx index cd47b0e21af7..cd531949d2cf 100644 --- a/sd/source/filter/html/buttonset.cxx +++ b/sd/source/filter/html/buttonset.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/filter/html/buttonset.hxx b/sd/source/filter/html/buttonset.hxx index bf7a90c431b6..babfe24c3513 100644 --- a/sd/source/filter/html/buttonset.hxx +++ b/sd/source/filter/html/buttonset.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ public: ~ButtonSet(); int getCount() const; - + bool getPreview( int nSet, const std::vector< rtl::OUString >& rButtons, Image& rImage ); bool exportButton( int nSet, const rtl::OUString& rPath, const rtl::OUString& rName ); diff --git a/sd/source/filter/html/htmlattr.cxx b/sd/source/filter/html/htmlattr.cxx index 0e3fdd0cba8c..2b33d280186e 100644 --- a/sd/source/filter/html/htmlattr.cxx +++ b/sd/source/filter/html/htmlattr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sd/source/filter/html/htmlattr.hxx b/sd/source/filter/html/htmlattr.hxx index e3f001758b45..97b215e79b87 100644 --- a/sd/source/filter/html/htmlattr.hxx +++ b/sd/source/filter/html/htmlattr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,16 +36,16 @@ class SdHtmlAttrPreview : public Control { protected: - Color m_aBackColor, m_aTextColor, m_aLinkColor; + Color m_aBackColor, m_aTextColor, m_aLinkColor; Color m_aVLinkColor, m_aALinkColor; public: SdHtmlAttrPreview( Window* pParent, const ResId& rResId ); ~SdHtmlAttrPreview(); - virtual void Paint( const Rectangle& rRect ); + virtual void Paint( const Rectangle& rRect ); - void SetColors( Color& aBack, Color& aText, Color& aLink, + void SetColors( Color& aBack, Color& aText, Color& aLink, Color& aVLink, Color& aALink ); }; diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index ec10650bfed8..149b869c09b9 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -104,7 +104,7 @@ using namespace ::com::sun::star::frame; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::document; -#define KEY_QUALITY "JPG-EXPORT-QUALITY" +#define KEY_QUALITY "JPG-EXPORT-QUALITY" // Parameter aus Itemset abfragen @@ -128,21 +128,21 @@ const char *pButtonNames[NUM_BUTTONS] = "collapse.png", }; -#define BTN_FIRST_0 0 -#define BTN_FIRST_1 1 -#define BTN_PREV_0 2 -#define BTN_PREV_1 3 -#define BTN_NEXT_0 4 -#define BTN_NEXT_1 5 -#define BTN_LAST_0 6 -#define BTN_LAST_1 7 -#define BTN_INDEX 8 -#define BTN_TEXT 9 -#define BTN_MORE 10 -#define BTN_LESS 11 +#define BTN_FIRST_0 0 +#define BTN_FIRST_1 1 +#define BTN_PREV_0 2 +#define BTN_PREV_1 3 +#define BTN_NEXT_0 4 +#define BTN_NEXT_1 5 +#define BTN_LAST_0 6 +#define BTN_LAST_1 7 +#define BTN_INDEX 8 +#define BTN_TEXT 9 +#define BTN_MORE 10 +#define BTN_LESS 11 // Fuer Detectfilter -#define CALC_OPTIONS "9,34,SYSTEM" +#define CALC_OPTIONS "9,34,SYSTEM" // ********************************************************************* // Hilfsklasse fuer das simple erzeugen von Dateien lokal/remote @@ -150,9 +150,9 @@ const char *pButtonNames[NUM_BUTTONS] = class EasyFile { private: - SvStream* pOStm; - SfxMedium* pMedium; - bool bOpen; + SvStream* pOStm; + SfxMedium* pMedium; + bool bOpen; public: @@ -380,7 +380,7 @@ HtmlExport::HtmlExport( const Sequence< PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell ) - : maPath( aPath ), + : maPath( aPath ), mpDoc(pExpDoc), mpDocSh( pDocShell ), meEC(NULL), @@ -677,7 +677,7 @@ void HtmlExport::InitExportParameters( const Sequence< PropertyValue >& rParams INetURLObject aINetURLObj( maPath ); DBG_ASSERT( aINetURLObj.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); - maExportPath = aINetURLObj.GetPartBeforeLastName(); // with trailing '/' + maExportPath = aINetURLObj.GetPartBeforeLastName(); // with trailing '/' maIndex = aINetURLObj.GetLastName(); mnSdPageCount = mpDoc->GetSdPageCount( PK_STANDARD ); @@ -1060,9 +1060,9 @@ bool HtmlExport::CreateImagesForPresPages() // ===================================================================== SdrTextObj* HtmlExport::GetLayoutTextObject(SdrPage* pPage) { - ULONG nObjectCount = pPage->GetObjCount(); - SdrObject* pObject = NULL; - SdrTextObj* pResult = NULL; + ULONG nObjectCount = pPage->GetObjCount(); + SdrObject* pObject = NULL; + SdrTextObj* pResult = NULL; for (ULONG nObject = 0; nObject < nObjectCount; nObject++) { @@ -1107,7 +1107,7 @@ bool HtmlExport::CreateHtmlTextForPresPages() if( mbDocColors ) { SetDocColors( pPage ); -// maBackColor = pPage->GetPageBackgroundColor(); +// maBackColor = pPage->GetPageBackgroundColor(); } // HTML Kopf @@ -1640,12 +1640,12 @@ bool HtmlExport::CreateHtmlForPresPages() for (ULONG nObject = 0; nObject < nClickableObjectCount; nObject++) { SdrObject* pObject = (SdrObject*)aClickableObjects.GetObject(nObject); - SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject); - SdIMapInfo* pIMapInfo = mpDoc->GetIMapInfo(pObject); + SdAnimationInfo* pInfo = mpDoc->GetAnimationInfo(pObject); + SdIMapInfo* pIMapInfo = mpDoc->GetIMapInfo(pObject); Rectangle aRect(pObject->GetCurrentBoundRect()); - Point aLogPos(aRect.TopLeft()); - bool bIsSquare = aRect.GetWidth() == aRect.GetHeight(); + Point aLogPos(aRect.TopLeft()); + bool bIsSquare = aRect.GetWidth() == aRect.GetHeight(); ULONG nPageWidth = pPage->GetSize().Width() - pPage->GetLftBorder() - pPage->GetRgtBorder(); @@ -1691,7 +1691,7 @@ bool HtmlExport::CreateHtmlForPresPages() } if (nPgNum != SDRPAGE_NOTFOUND) { - nPgNum = (nPgNum - 1) / 2; // SdrPageNum --> SdPageNum + nPgNum = (nPgNum - 1) / 2; // SdrPageNum --> SdPageNum aURL = CreatePageURL(nPgNum); } @@ -1756,14 +1756,14 @@ bool HtmlExport::CreateHtmlForPresPages() \************************************************************/ if( pInfo ) { - String aHRef; + String aHRef; presentation::ClickAction eClickAction = pInfo->meClickAction; switch( eClickAction ) { case presentation::ClickAction_BOOKMARK: { - BOOL bIsMasterPage; + BOOL bIsMasterPage; USHORT nPgNum = mpDoc->GetPageByName( pInfo->GetBookmark(), bIsMasterPage ); SdrObject* pObj = NULL; @@ -2106,7 +2106,7 @@ void HtmlExport::CreateFileNames() mpPageNames = new String*[mnSdPageCount]; mpTextFiles = new String*[mnSdPageCount]; - mbHeader = false; // Ueberschrift auf Uebersichtsseite? + mbHeader = false; // Ueberschrift auf Uebersichtsseite? for (USHORT nSdPage = 0; nSdPage < mnSdPageCount; nSdPage++) { @@ -2501,7 +2501,7 @@ bool HtmlExport::CreateNavBarFrames() if(mnButtonThema != -1) aButton = CreateImage(GetButtonName(BTN_TEXT), aButton); - String aText0( RTL_CONSTASCII_USTRINGPARAM("text0")); + String aText0( RTL_CONSTASCII_USTRINGPARAM("text0")); aText0 += maHTMLExtension; aStr += CreateLink( aText0, aButton, String(RTL_CONSTASCII_USTRINGPARAM("_top"))); aStr.AppendAscii( "\r\n" ); @@ -2634,7 +2634,7 @@ String HtmlExport::CreateNavBar( USHORT nSdPage, bool bIsText ) const // to Previous page if(nSdPage > 0) aStr += CreateLink( bIsText?*mpTextFiles[nSdPage-1]: - *mpHTMLFiles[nSdPage-1], aStrNavPrev); + *mpHTMLFiles[nSdPage-1], aStrNavPrev); else aStr += aStrNavPrev; aStr.Append(sal_Unicode(' ')); @@ -2835,7 +2835,7 @@ String HtmlExport::CreateHTMLCircleArea( ULONG nRadius, String HtmlExport::CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPolygon, Size aShift, double fFactor, const String& rHRef ) const { - String aStr; + String aStr; const sal_uInt32 nNoOfPolygons(rPolyPolygon.count()); for ( sal_uInt32 nXPoly = 0L; nXPoly < nNoOfPolygons; nXPoly++ ) @@ -2923,16 +2923,16 @@ String HtmlExport::CreatePageURL( USHORT nPgNum ) bool HtmlExport::CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix /* = false */ ) { - INetURLObject aURL( SvtPathOptions().GetConfigPath() ); - String aScript; + INetURLObject aURL( SvtPathOptions().GetConfigPath() ); + String aScript; aURL.Append( String( RTL_CONSTASCII_USTRINGPARAM("webcast") ) ); aURL.Append( rSource ); meEC.SetContext( STR_HTMLEXP_ERROR_OPEN_FILE, rSource ); - ULONG nErr = 0; - SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); + ULONG nErr = 0; + SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ ); if( pIStm ) { @@ -3098,8 +3098,8 @@ String HtmlExport::InsertSound( const String& rSoundFile ) if( rSoundFile.Len() == 0 ) return rSoundFile; - String aStr( RTL_CONSTASCII_USTRINGPARAM("<embed src=\"") ); - INetURLObject aURL( rSoundFile ); + String aStr( RTL_CONSTASCII_USTRINGPARAM("<embed src=\"") ); + INetURLObject aURL( rSoundFile ); DBG_ASSERT( aURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" ); diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index fd5a30fa2f0c..61ed24f6061f 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,12 +51,12 @@ #define NUM_BUTTONS 12 -#define PUB_LOWRES_WIDTH 640 -#define PUB_LOWRES_HEIGHT 480 -#define PUB_MEDRES_WIDTH 800 -#define PUB_MEDRES_HEIGHT 600 -#define PUB_HIGHRES_WIDTH 1024 -#define PUB_HIGHRES_HEIGHT 768 +#define PUB_LOWRES_WIDTH 640 +#define PUB_LOWRES_HEIGHT 480 +#define PUB_MEDRES_WIDTH 800 +#define PUB_MEDRES_HEIGHT 600 +#define PUB_HIGHRES_WIDTH 1024 +#define PUB_HIGHRES_HEIGHT 768 #define HtmlButtonThemaStr = "private://gallery/hidden/HtmlExportButtons"; @@ -77,18 +77,18 @@ class View; class HtmlErrorContext : public ErrorContext { private: - USHORT mnResId; - String maURL1; - String maURL2; + USHORT mnResId; + String maURL1; + String maURL2; public: HtmlErrorContext(Window *pWin=0); ~HtmlErrorContext() {}; - virtual BOOL GetString( ULONG nErrId, String& rCtxStr ); + virtual BOOL GetString( ULONG nErrId, String& rCtxStr ); - void SetContext( USHORT nResId, const String& rURL ); - void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 ); + void SetContext( USHORT nResId, const String& rURL ); + void SetContext( USHORT nResId, const String& rURL1, const String& rURL2 ); }; // ===================================================================== @@ -132,13 +132,13 @@ class HtmlExport bool mbDownload; bool mbAutoSlide; - UINT32 mnSlideDuration; + UINT32 mnSlideDuration; bool mbSlideSound; bool mbHiddenSlides; bool mbEndless; - bool mbUserAttr; // die folgenden Farben werden fuer das <body> - Color maTextColor; // tag genutzt, wenn mbUserAttr true ist + bool mbUserAttr; // die folgenden Farben werden fuer das <body> + Color maTextColor; // tag genutzt, wenn mbUserAttr true ist Color maBackColor; Color maLinkColor; Color maVLinkColor; @@ -146,13 +146,13 @@ class HtmlExport Color maFirstPageColor; bool mbDocColors; - String maHTMLExtension; + String maHTMLExtension; String** mpHTMLFiles; String** mpImageFiles; String** mpPageNames; String** mpTextFiles; - String maExportPath; // Das Ausgabeverzeichnes bzw. die URL + String maExportPath; // Das Ausgabeverzeichnes bzw. die URL String maIndexUrl; String maURLPath; String maCGIPath; @@ -166,49 +166,49 @@ class HtmlExport void SetDocColors( SdPage* pPage = NULL ); - bool CreateImagesForPresPages(); - bool CreateHtmlTextForPresPages(); - bool CreateHtmlForPresPages(); - bool CreateContentPage(); - void CreateFileNames(); - bool CreateBitmaps(); - bool CreateOutlinePages(); - bool CreateFrames(); - bool CreateNotesPages(); - bool CreateNavBarFrames(); - - bool CreateASPScripts(); - bool CreatePERLScripts(); - bool CreateImageFileList(); - bool CreateImageNumberFile(); - - bool checkForExistingFiles(); - bool checkFileExists( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >& xFileAccess, String const & aFileName ); + bool CreateImagesForPresPages(); + bool CreateHtmlTextForPresPages(); + bool CreateHtmlForPresPages(); + bool CreateContentPage(); + void CreateFileNames(); + bool CreateBitmaps(); + bool CreateOutlinePages(); + bool CreateFrames(); + bool CreateNotesPages(); + bool CreateNavBarFrames(); + + bool CreateASPScripts(); + bool CreatePERLScripts(); + bool CreateImageFileList(); + bool CreateImageNumberFile(); + + bool checkForExistingFiles(); + bool checkFileExists( ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XSimpleFileAccess >& xFileAccess, String const & aFileName ); String getDocumentTitle(); - bool SavePresentation(); + bool SavePresentation(); - String CreateLink( const String& aLink, const String& aText, + String CreateLink( const String& aLink, const String& aText, const String& aTarget = String()) const; - String CreateImage( const String& aImage, const String& aAltText, INT16 nWidth = -1, INT16 nHeight = -1 ) const; - String CreateNavBar( USHORT nSdPage, bool bIsText ) const; - String CreateBodyTag() const; + String CreateImage( const String& aImage, const String& aAltText, INT16 nWidth = -1, INT16 nHeight = -1 ) const; + String CreateNavBar( USHORT nSdPage, bool bIsText ) const; + String CreateBodyTag() const; - String ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor ); - String TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor ); + String ParagraphToHTMLString( SdrOutliner* pOutliner, ULONG nPara, const Color& rBackgroundColor ); + String TextAttribToHTMLString( SfxItemSet* pSet, HtmlState* pState, const Color& rBackgroundColor ); - String CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor ); - String CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); - String CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); + String CreateTextForTitle( SdrOutliner* pOutliner, SdPage* pPage, const Color& rBackgroundColor ); + String CreateTextForPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); + String CreateTextForNotesPage( SdrOutliner* pOutliner, SdPage* pPage, bool bHeadLine, const Color& rBackgroundColor ); - String CreateHTMLCircleArea( ULONG nRadius, ULONG nCenterX, + String CreateHTMLCircleArea( ULONG nRadius, ULONG nCenterX, ULONG nCenterY, const String& rHRef ) const; - String CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const String& rHRef ) const; - String CreateHTMLRectArea( const Rectangle& rRect, + String CreateHTMLPolygonArea( const ::basegfx::B2DPolyPolygon& rPolyPoly, Size aShift, double fFactor, const String& rHRef ) const; + String CreateHTMLRectArea( const Rectangle& rRect, const String& rHRef ) const; - String CreatePageURL( USHORT nPgNum ); - + String CreatePageURL( USHORT nPgNum ); + String InsertSound( const String& rSoundFile ); bool CopyFile( const String& rSourceFile, const String& rDestPath ); bool CopyScript( const String& rPath, const String& rSource, const String& rDest, bool bUnix = false ); @@ -230,9 +230,9 @@ class HtmlExport HtmlExport( rtl::OUString aPath, const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rParams, SdDrawDocument* pExpDoc, ::sd::DrawDocShell* pDocShell ); virtual ~HtmlExport(); - static String ColorToHTMLString( Color aColor ); - static String StringToHTMLString( const String& rString ); - static String StringToURL( const String& rURL ); + static String ColorToHTMLString( Color aColor ); + static String StringToHTMLString( const String& rString ); + static String StringToURL( const String& rURL ); }; #endif // _SD_HTMLEX_HXX diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 6c0e4de2d3f9..48a2f85ad5a0 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -78,7 +78,7 @@ extern void InterpolateFixedBitmap( FixedBitmap * pBitmap ); const UINT16 nMagic = (UINT16)0x1977; // Key fuer die soffice.ini -#define KEY_QUALITY "JPG-EXPORT-QUALITY" +#define KEY_QUALITY "JPG-EXPORT-QUALITY" // Die Help Ids der einzelnen Seiten ULONG aPageHelpIds[NOOFPAGES] = @@ -97,49 +97,49 @@ ULONG aPageHelpIds[NOOFPAGES] = class SdPublishingDesign { public: - String m_aDesignName; + String m_aDesignName; - HtmlPublishMode m_eMode; + HtmlPublishMode m_eMode; // special WebCast options PublishingScript m_eScript; - String m_aCGI; - String m_aURL; + String m_aCGI; + String m_aURL; // special Kiosk options - BOOL m_bAutoSlide; - UINT32 m_nSlideDuration; - BOOL m_bEndless; + BOOL m_bAutoSlide; + UINT32 m_nSlideDuration; + BOOL m_bEndless; // special HTML options - BOOL m_bContentPage; - BOOL m_bNotes; + BOOL m_bContentPage; + BOOL m_bNotes; // misc options - UINT16 m_nResolution; - String m_aCompression; + UINT16 m_nResolution; + String m_aCompression; PublishingFormat m_eFormat; - BOOL m_bSlideSound; + BOOL m_bSlideSound; BOOL m_bHiddenSlides; // titel page information - String m_aAuthor; - String m_aEMail; - String m_aWWW; - String m_aMisc; - BOOL m_bDownload; - BOOL m_bCreated; // not used + String m_aAuthor; + String m_aEMail; + String m_aWWW; + String m_aMisc; + BOOL m_bDownload; + BOOL m_bCreated; // not used // buttons and colorscheme - INT16 m_nButtonThema; - BOOL m_bUserAttr; - Color m_aBackColor; - Color m_aTextColor; + INT16 m_nButtonThema; + BOOL m_bUserAttr; + Color m_aBackColor; + Color m_aTextColor; Color m_aLinkColor; - Color m_aVLinkColor; - Color m_aALinkColor; - BOOL m_bUseAttribs; - BOOL m_bUseColor; + Color m_aVLinkColor; + Color m_aALinkColor; + BOOL m_bUseAttribs; + BOOL m_bUseColor; SdPublishingDesign(); @@ -159,7 +159,7 @@ SdPublishingDesign::SdPublishingDesign() m_eFormat = FORMAT_PNG; - String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); + String aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/JPG" ) ); FilterConfigItem aFilterConfigItem( aFilterConfigPath ); sal_Int32 nCompression = aFilterConfigItem.ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( KEY_QUALITY ) ), 75 ); m_aCompression = UniString::CreateFromInt32( nCompression ); @@ -167,33 +167,33 @@ SdPublishingDesign::SdPublishingDesign() SvtUserOptions aUserOptions; - m_nResolution = PUB_LOWRES_WIDTH; + m_nResolution = PUB_LOWRES_WIDTH; m_aAuthor = aUserOptions.GetFirstName(); if( m_aAuthor.Len() && aUserOptions.GetLastName().getLength() ) - m_aAuthor += sal_Unicode(' '); + m_aAuthor += sal_Unicode(' '); m_aAuthor += (String)aUserOptions.GetLastName(); m_aEMail = aUserOptions.GetEmail(); - m_bDownload = FALSE; -//-/ m_bCreated = TRUE; - m_nButtonThema = -1; + m_bDownload = FALSE; +//-/ m_bCreated = TRUE; + m_nButtonThema = -1; - m_bUserAttr = FALSE; - m_bUseAttribs = TRUE; - m_bUseColor = TRUE; + m_bUserAttr = FALSE; + m_bUseAttribs = TRUE; + m_bUseColor = TRUE; m_aBackColor = COL_WHITE; m_aTextColor = COL_BLACK; m_aLinkColor = COL_BLUE; - m_aVLinkColor = COL_LIGHTBLUE; - m_aALinkColor = COL_GRAY; + m_aVLinkColor = COL_LIGHTBLUE; + m_aALinkColor = COL_GRAY; - m_eScript = SCRIPT_ASP; + m_eScript = SCRIPT_ASP; - m_bAutoSlide = TRUE; + m_bAutoSlide = TRUE; m_nSlideDuration = 15; - m_bEndless = TRUE; + m_bEndless = TRUE; - m_bSlideSound = TRUE; + m_bSlideSound = TRUE; m_bHiddenSlides = FALSE; } @@ -204,22 +204,22 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const { return ( - m_eMode == rDesign.m_eMode && + m_eMode == rDesign.m_eMode && m_nResolution == rDesign.m_nResolution && m_aCompression == rDesign.m_aCompression && - m_eFormat == rDesign.m_eFormat && + m_eFormat == rDesign.m_eFormat && m_bHiddenSlides == rDesign.m_bHiddenSlides && ( // compare html options (m_eMode != PUBLISH_HTML && m_eMode != PUBLISH_FRAMES) || ( m_bContentPage == rDesign.m_bContentPage && - m_bNotes == rDesign.m_bNotes && - m_aAuthor == rDesign.m_aAuthor && - m_aEMail == rDesign.m_aEMail && - m_aWWW == rDesign.m_aWWW && - m_aMisc == rDesign.m_aMisc && + m_bNotes == rDesign.m_bNotes && + m_aAuthor == rDesign.m_aAuthor && + m_aEMail == rDesign.m_aEMail && + m_aWWW == rDesign.m_aWWW && + m_aMisc == rDesign.m_aMisc && m_bDownload == rDesign.m_bDownload && -//-/ m_bCreated == rDesign.m_bCreated && +//-/ m_bCreated == rDesign.m_bCreated && m_nButtonThema == rDesign.m_nButtonThema && m_bUserAttr == rDesign.m_bUserAttr && m_aBackColor == rDesign.m_aBackColor && @@ -232,7 +232,7 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const m_bUseColor == rDesign.m_bUseColor ) ) && - ( // compare kiosk options + ( // compare kiosk options (m_eMode != PUBLISH_KIOSK) || ( m_bAutoSlide == rDesign.m_bAutoSlide && @@ -246,7 +246,7 @@ int SdPublishingDesign::operator ==(const SdPublishingDesign & rDesign) const ) ) ) && - ( // compare WebCast options + ( // compare WebCast options (m_eMode != PUBLISH_WEBCAST) || ( m_eScript == rDesign.m_eScript && @@ -285,7 +285,7 @@ SvStream& operator >> (SvStream& rIn, SdPublishingDesign& rDesign) rIn.ReadByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); rIn.ReadByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); rIn >> rDesign.m_bDownload; - rIn >> rDesign.m_bCreated; // not used + rIn >> rDesign.m_bCreated; // not used rIn >> rDesign.m_nButtonThema; rIn >> rDesign.m_bUserAttr; rIn >> rDesign.m_aBackColor; @@ -332,7 +332,7 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) rOut.WriteByteString( rDesign.m_aWWW, RTL_TEXTENCODING_UTF8 ); rOut.WriteByteString( rDesign.m_aMisc, RTL_TEXTENCODING_UTF8 ); rOut << rDesign.m_bDownload; - rOut << rDesign.m_bCreated; // not used + rOut << rDesign.m_bCreated; // not used rOut << rDesign.m_nButtonThema; rOut << rDesign.m_bUserAttr; rOut << rDesign.m_aBackColor; @@ -362,9 +362,9 @@ SvStream& operator << (SvStream& rOut, const SdPublishingDesign& rDesign) class SdDesignNameDlg : public ModalDialog { private: - Edit m_aEdit; - OKButton m_aBtnOK; - CancelButton m_aBtnCancel; + Edit m_aEdit; + OKButton m_aBtnOK; + CancelButton m_aBtnCancel; public: SdDesignNameDlg(Window* pWindow, const String& aName ); @@ -381,18 +381,18 @@ public: // Konstruktor des Dialogs // ===================================================================== SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) -: ModalDialog(pWindow, SdResId( DLG_PUBLISHING )) -, mpButtonSet( new ButtonSet() ) -, aBottomLine( this, SdResId( BOTTOM_LINE ) ) -, aHelpButton(this,SdResId(BUT_HELP)) -, aCancelButton(this,SdResId(BUT_CANCEL)) -, aLastPageButton(this,SdResId(BUT_LAST)) -, aNextPageButton(this,SdResId(BUT_NEXT)) -, aFinishButton(this,SdResId(BUT_FINISH)) -, aAssistentFunc(NOOFPAGES) -, m_bButtonsDirty(TRUE) -, m_bDesignListDirty(FALSE) -, m_pDesign(NULL) +: ModalDialog(pWindow, SdResId( DLG_PUBLISHING )) +, mpButtonSet( new ButtonSet() ) +, aBottomLine( this, SdResId( BOTTOM_LINE ) ) +, aHelpButton(this,SdResId(BUT_HELP)) +, aCancelButton(this,SdResId(BUT_CANCEL)) +, aLastPageButton(this,SdResId(BUT_LAST)) +, aNextPageButton(this,SdResId(BUT_NEXT)) +, aFinishButton(this,SdResId(BUT_FINISH)) +, aAssistentFunc(NOOFPAGES) +, m_bButtonsDirty(TRUE) +, m_bDesignListDirty(FALSE) +, m_pDesign(NULL) { m_bImpress = eDocType == DOCUMENT_TYPE_IMPRESS; @@ -426,7 +426,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) pPage2_ASP->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl)); pPage2_PERL->SetClickHdl(LINK(this,SdPublishingDlg,WebServerHdl)); - String aText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("index")) ); + String aText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("index")) ); aText += String(SdResId(STR_HTMLEXP_DEFAULT_EXTENSION)); pPage2_Index->SetText(aText); pPage2_CGI->SetText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "/cgi-bin/" ) ) ); @@ -490,7 +490,7 @@ SdPublishingDlg::~SdPublishingDlg() { if( m_pDesignList ) { - for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) + for( UINT16 nIndex = 0; nIndex < m_pDesignList->Count(); nIndex++ ) delete (SdPublishingDesign*)m_pDesignList->GetObject(nIndex); } @@ -639,8 +639,8 @@ void SdPublishingDlg::CreatePages() if(m_bImpress) aAssistentFunc.InsertControl(4, pPage4_Download = new CheckBox(this,SdResId(PAGE4_DOWNLOAD))); -//-/ aAssistentFunc.InsertControl(4, -//-/ pPage4_Created = new CheckBox(this,SdResId(PAGE4_CREATED))); +//-/ aAssistentFunc.InsertControl(4, +//-/ pPage4_Created = new CheckBox(this,SdResId(PAGE4_CREATED))); // Seite 5 aAssistentFunc.InsertControl(5, @@ -766,7 +766,7 @@ void SdPublishingDlg::RemovePages() delete pPage4_Misc; if(m_bImpress) delete pPage4_Download; -//-/ delete pPage4_Created; +//-/ delete pPage4_Created; delete pPage5_Bmp; delete pPage5_Titel; @@ -906,7 +906,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) // #92433# try to guess protocol for user's homepage INetURLObject aHomeURL( pPage4_WWW->GetText(), - INET_PROT_HTTP, // default proto is HTTP + INET_PROT_HTTP, // default proto is HTTP INetURLObject::ENCODE_ALL ); aValue.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "HomepageURL" ) ); @@ -964,7 +964,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams ) } // Seite 6 -// aSet.Put(SfxBoolItem(ATTR_PUBLISH_SLIDESOUND,pPage6_Sound->IsChecked())); +// aSet.Put(SfxBoolItem(ATTR_PUBLISH_SLIDESOUND,pPage6_Sound->IsChecked())); rParams.realloc( aProps.size() ); @@ -1001,7 +1001,7 @@ IMPL_LINK( SdPublishingDlg, DesignHdl, RadioButton *, pButton ) if(pPage1_Designs->GetSelectEntryCount() == 0) pPage1_Designs->SelectEntryPos(0); - USHORT nPos = pPage1_Designs->GetSelectEntryPos(); + USHORT nPos = pPage1_Designs->GetSelectEntryPos(); m_pDesign = (SdPublishingDesign*)m_pDesignList->GetObject(nPos); DBG_ASSERT(m_pDesign, "Kein Design? Das darf nicht sein! (CL)"); @@ -1516,7 +1516,7 @@ void SdPublishingDlg::SetDesign( SdPublishingDesign* pDesign ) pPage4_Misc->SetText(pDesign->m_aMisc); if(m_bImpress) pPage4_Download->Check(pDesign->m_bDownload); -//-/ pPage4_Created->Check(pDesign->m_bCreated); +//-/ pPage4_Created->Check(pDesign->m_bCreated); pPage5_TextOnly->Check(pDesign->m_nButtonThema == -1); if(pDesign->m_nButtonThema != -1) @@ -1552,7 +1552,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) if(!pDesign) return; - pDesign->m_eMode = pPage2_Standard->IsChecked()?PUBLISH_HTML: + pDesign->m_eMode = pPage2_Standard->IsChecked()?PUBLISH_HTML: pPage2_Frames->IsChecked()?PUBLISH_FRAMES: pPage2_Kiosk->IsChecked()?PUBLISH_KIOSK: PUBLISH_WEBCAST; @@ -1581,7 +1581,7 @@ void SdPublishingDlg::GetDesign( SdPublishingDesign* pDesign ) pDesign->m_aWWW = pPage4_WWW->GetText(); pDesign->m_aMisc = pPage4_Misc->GetText(); pDesign->m_bDownload = m_bImpress?pPage4_Download->IsChecked():FALSE; -//-/ pDesign->m_bCreated = pPage4_Created->IsChecked(); +//-/ pDesign->m_bCreated = pPage4_Created->IsChecked(); if(pPage5_TextOnly->IsChecked()) pDesign->m_nButtonThema = -1; @@ -1723,7 +1723,7 @@ BOOL SdPublishingDlg::Save() // ===================================================================== SdDesignNameDlg::SdDesignNameDlg(Window* pWindow, const String& aName): ModalDialog (pWindow, SdResId( DLG_DESIGNNAME )), - m_aEdit (this, SdResId(EDT_NAME)), + m_aEdit (this, SdResId(EDT_NAME)), m_aBtnOK (this, SdResId(BTN_SAVE)), m_aBtnCancel (this, SdResId(BTN_NOSAVE)) { diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src index 00e9b4af75e4..cc57ab31b4af 100644 --- a/sd/source/filter/html/pubdlg.src +++ b/sd/source/filter/html/pubdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -386,7 +386,7 @@ ModalDialog DLG_PUBLISHING Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~PNG"; }; - + RadioButton PAGE3_GIF { Pos = MAP_APPFONT( 12, 63 ); diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index e484fea74b4a..ce59fd03b60d 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |