sd/inc/sddllapi.h | 1 - sd/source/filter/html/htmlex.cxx | 6 +++--- sd/source/filter/html/htmlex.hxx | 4 +--- sd/source/filter/html/htmlpublishmode.hxx | 28 ++++++++++++++++++++++++++++ sd/source/filter/html/pubdlg.cxx | 4 ++++ sd/source/ui/dlg/PhotoAlbumDialog.cxx | 5 +++++ sd/source/ui/dlg/sdtreelb.cxx | 2 +- sd/source/ui/inc/WindowUpdater.hxx | 2 +- sd/source/ui/inc/optsitem.hxx | 4 ++-- sd/source/ui/inc/pubdlg.hxx | 4 ---- sd/source/ui/inc/sdtreelb.hxx | 12 ++++++------ 11 files changed, 51 insertions(+), 21 deletions(-)
New commits: commit 5a1e2be29d886e821e5727ba185c40be1d24fc12 Author: Stephan Bergmann <[email protected]> Date: Thu Mar 21 12:58:24 2013 +0100 Short-term fix around the SD_DLLIMPLEMTATION debacle (being defined for three different sd/Library_sd*.mk files), just like it is done in all the other sd/source/ui/dlg/*.cxx files already. Change-Id: I1b9e886c12acb1bfd73bea52f40260760a5f46ff diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index 03ccd07..8b9bc57 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -6,6 +6,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifdef SD_DLLIMPLEMENTATION +#undef SD_DLLIMPLEMENTATION +#endif + #include "PhotoAlbumDialog.hxx" #include <com/sun/star/graphic/GraphicProvider.hpp> commit f4de9aba9e13254543109dc7c33ed0417fd5eee2 Author: Stephan Bergmann <[email protected]> Date: Thu Mar 21 12:53:48 2013 +0100 SD_DLLPRIVATE -> SAL_DLLPRIVATE Change-Id: Ia5f99e3c7cb5aa11cd33ba7f00afc4b9da10f0b7 diff --git a/sd/inc/sddllapi.h b/sd/inc/sddllapi.h index 70a837a..f2d82e4 100644 --- a/sd/inc/sddllapi.h +++ b/sd/inc/sddllapi.h @@ -27,7 +27,6 @@ #else #define SD_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#define SD_DLLPRIVATE SAL_DLLPRIVATE #endif /* INCLUDED_SDDLLAPI_H */ diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index a90bd9c..42e883e 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -72,7 +72,7 @@ public: }; -sal_Bool SD_DLLPRIVATE SdPageObjsTLB::bIsInDrag = sal_False; +sal_Bool SAL_DLLPRIVATE SdPageObjsTLB::bIsInDrag = sal_False; sal_Bool SdPageObjsTLB::IsInDrag() { diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index 9f18cd2..9d8582c 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -133,7 +133,7 @@ private: The output device to update. When it is <null/> then the call is ignored. */ - SD_DLLPRIVATE void UpdateWindow (OutputDevice* pDevice) const; + SAL_DLLPRIVATE void UpdateWindow (OutputDevice* pDevice) const; }; } // end of namespace sd diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 5473ead..8455531 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -84,8 +84,8 @@ private: sal_Bool mbInit : 1; sal_Bool mbEnableModify : 1; - SD_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; - SD_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const; + SAL_DLLPRIVATE void Commit( SdOptionsItem& rCfgItem ) const; + SAL_DLLPRIVATE ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const; protected: diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index 99dec07..5f8cdcf 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -59,7 +59,7 @@ class SD_DLLPUBLIC SdPageObjsTLB : public SvTreeListBox { private: - static sal_Bool SD_DLLPRIVATE bIsInDrag; ///< static, in the case the navigator is deleted in ExecuteDrag + static sal_Bool SAL_DLLPRIVATE bIsInDrag; ///< static, in the case the navigator is deleted in ExecuteDrag public: @@ -95,13 +95,13 @@ public: ::sd::DrawDocShell& mrDocShell; NavigatorDragType meDragType; const ::com::sun::star::uno::Any maTreeListBoxData; - SD_DLLPRIVATE virtual ~SdPageObjsTransferable(); + SAL_DLLPRIVATE virtual ~SdPageObjsTransferable(); - SD_DLLPRIVATE virtual void AddSupportedFormats(); - SD_DLLPRIVATE virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - SD_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ); + SAL_DLLPRIVATE virtual void AddSupportedFormats(); + SAL_DLLPRIVATE virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + SAL_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ); - SD_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); + SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException ); }; friend class SdPageObjsTLB::SdPageObjsTransferable; commit 698a03ef71e6940c9102a4019f28fa323513d81a Author: Stephan Bergmann <[email protected]> Date: Thu Mar 21 12:44:22 2013 +0100 Get rid of NUM_BUTTONS macro Change-Id: Ia822a1b6d7c250a5f9de33c381b57f5cbe4b059e diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index de8bb28..034583e 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -98,8 +98,7 @@ using namespace ::com::sun::star::document; #define RESTOHTML( res ) StringToHTMLString(String(SdResId(res))) #define S2H( str ) StringToHTMLString( str ) -// when changing, also change NUM_BUTTONS in pubdlg.hxx!! -const char *pButtonNames[NUM_BUTTONS] = +const char *pButtonNames[] = { "first-inactive.png", "first.png", @@ -2629,7 +2628,7 @@ bool HtmlExport::CreateBitmaps() { if(mnButtonThema != -1 && mpButtonSet.get() ) { - for( int nButton = 0; nButton < NUM_BUTTONS; nButton++ ) + for( int nButton = 0; nButton != SAL_N_ELEMENTS(pButtonNames); nButton++ ) { if(!mbFrames && (nButton == BTN_MORE || nButton == BTN_LESS)) continue; diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 349a10d..6ef80ed 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -40,8 +40,6 @@ #include <vector> #include <boost/scoped_ptr.hpp> -#define NUM_BUTTONS 12 - #define PUB_LOWRES_WIDTH 640 #define PUB_LOWRES_HEIGHT 480 #define PUB_MEDRES_WIDTH 800 commit 1a41e84d0ae2a3763f0571e5fa0d03f19cb7f22b Author: Stephan Bergmann <[email protected]> Date: Thu Mar 21 12:41:17 2013 +0100 Move HtmlPublishMode into a header of its own Change-Id: I522619eb4304cbe2d2d862f01dcf8384ac4eb0cc diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index c05ed5d..de8bb28 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -71,6 +71,7 @@ #include "cppuhelper/exc_hlp.hxx" #include "drawdoc.hxx" +#include "htmlpublishmode.hxx" #include "Outliner.hxx" #include "sdpage.hxx" #include "sdattr.hxx" diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx index 8d4a578..349a10d 100644 --- a/sd/source/filter/html/htmlex.hxx +++ b/sd/source/filter/html/htmlex.hxx @@ -35,7 +35,7 @@ #include "assclass.hxx" #include "sdresid.hxx" -#include "pubdlg.hxx" +#include "htmlpublishmode.hxx" #include <vector> #include <boost/scoped_ptr.hpp> diff --git a/sd/source/filter/html/htmlpublishmode.hxx b/sd/source/filter/html/htmlpublishmode.hxx new file mode 100644 index 0000000..a7871db --- /dev/null +++ b/sd/source/filter/html/htmlpublishmode.hxx @@ -0,0 +1,28 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_SD_SOURCE_FILTER_HTML_HTMLPUBLISHMODE_HXX +#define INCLUDED_SD_SOURCE_FILTER_HTML_HTMLPUBLISHMODE_HXX + +enum HtmlPublishMode { + PUBLISH_HTML, PUBLISH_FRAMES, PUBLISH_WEBCAST, PUBLISH_KIOSK }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 8376232d..0d42988 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -50,8 +50,10 @@ #include "sdresid.hxx" #include "sdattr.hxx" #include "pubdlg.hrc" +#include "pubdlg.hxx" #include "htmlattr.hxx" #include "htmlex.hxx" +#include "htmlpublishmode.hxx" #include "helpids.h" #include "buttonset.hxx" diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 2fb89bc..e4b21fe 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -33,8 +33,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/ptr_container/ptr_vector.hpp> -enum HtmlPublishMode { PUBLISH_HTML, PUBLISH_FRAMES, PUBLISH_WEBCAST, PUBLISH_KIOSK }; - class FixedText; class RadioButton; class ListBox; commit 3abd7eeb94accd0bfc23399483001823edaaa3bd Author: Stephan Bergmann <[email protected]> Date: Thu Mar 21 12:31:05 2013 +0100 Move NOOFPAGES macro to .cxx where it is used Change-Id: I0ae8bb51cef6ab5ba982ee0efd79514c11a7b3e7 diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index c540ec4..8376232d 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -61,6 +61,8 @@ using namespace com::sun::star::beans; using ::rtl::OUString; +#define NOOFPAGES 6 + extern void InterpolateFixedBitmap( FixedBitmap * pBitmap ); //ID for the config-data with the HTML-settings diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 86943a9..2fb89bc 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -33,8 +33,6 @@ #include <boost/scoped_ptr.hpp> #include <boost/ptr_container/ptr_vector.hpp> -#define NOOFPAGES 6 - enum HtmlPublishMode { PUBLISH_HTML, PUBLISH_FRAMES, PUBLISH_WEBCAST, PUBLISH_KIOSK }; class FixedText; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
