diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-03-21 12:44:22 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-03-21 13:00:07 +0100 |
| commit | 698a03ef71e6940c9102a4019f28fa323513d81a (patch) | |
| tree | 686dee6f13120866838e6759e6efe7618bdcd086 /sd/source/filter/html | |
| parent | 1a41e84d0ae2a3763f0571e5fa0d03f19cb7f22b (diff) | |
Get rid of NUM_BUTTONS macro
Change-Id: Ia822a1b6d7c250a5f9de33c381b57f5cbe4b059e
Diffstat (limited to 'sd/source/filter/html')
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 5 | ||||
| -rw-r--r-- | sd/source/filter/html/htmlex.hxx | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index de8bb286db81..034583e175fd 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 349a10d22696..6ef80edd9bbf 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 |