diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2012-02-21 14:20:32 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2012-02-21 20:56:57 +0100 |
| commit | 6998c635b06dca7b5a335c71b74ed0862e9d7910 (patch) | |
| tree | 6bb2f950d1219aebb02b6209ee4fb1e82bbed649 /framework | |
| parent | 8361d62aa9d497b60c575ff04ff1f88847e84863 (diff) | |
expand and remove css_ui macro
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 9fd22cdee959..95ed4c1d57b1 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -72,9 +72,6 @@ using namespace ::com::sun::star; #ifndef css #define css ::com::sun::star #endif -#ifndef css_ui -#define css_ui ::com::sun::star::ui -#endif static const char HELPID_PREFIX[] = "helpid:"; @@ -93,23 +90,23 @@ static sal_uInt16 impl_convertItemStyleToItemBits( sal_Int16 nStyle ) { sal_uInt16 nItemBits( 0 ); - if (( nStyle & css_ui::ItemStyle::ALIGN_RIGHT ) == css_ui::ItemStyle::ALIGN_RIGHT ) + if (( nStyle & ::com::sun::star::ui::ItemStyle::ALIGN_RIGHT ) == ::com::sun::star::ui::ItemStyle::ALIGN_RIGHT ) nItemBits |= SIB_RIGHT; - else if ( nStyle & css_ui::ItemStyle::ALIGN_LEFT ) + else if ( nStyle & ::com::sun::star::ui::ItemStyle::ALIGN_LEFT ) nItemBits |= SIB_LEFT; else nItemBits |= SIB_CENTER; - if (( nStyle & css_ui::ItemStyle::DRAW_FLAT ) == css_ui::ItemStyle::DRAW_FLAT ) + if (( nStyle & ::com::sun::star::ui::ItemStyle::DRAW_FLAT ) == ::com::sun::star::ui::ItemStyle::DRAW_FLAT ) nItemBits |= SIB_FLAT; - else if ( nStyle & css_ui::ItemStyle::DRAW_OUT3D ) + else if ( nStyle & ::com::sun::star::ui::ItemStyle::DRAW_OUT3D ) nItemBits |= SIB_OUT; else nItemBits |= SIB_IN; - if (( nStyle & css_ui::ItemStyle::AUTO_SIZE ) == css_ui::ItemStyle::AUTO_SIZE ) + if (( nStyle & ::com::sun::star::ui::ItemStyle::AUTO_SIZE ) == ::com::sun::star::ui::ItemStyle::AUTO_SIZE ) nItemBits |= SIB_AUTOSIZE; - if ( nStyle & css_ui::ItemStyle::OWNER_DRAW ) + if ( nStyle & ::com::sun::star::ui::ItemStyle::OWNER_DRAW ) nItemBits |= SIB_USERDRAW; return nItemBits; @@ -485,7 +482,7 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc sal_Int16 nOffset( 0 ); sal_Int16 nStyle( 0 ); sal_Int16 nWidth( 0 ); - sal_uInt16 nType( css_ui::ItemType::DEFAULT ); + sal_uInt16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); try { |