diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-31 17:09:48 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-31 17:09:48 +0000 |
| commit | 73d0adb99b0b0a952b9a2a78a335f4b5bb29c279 (patch) | |
| tree | 3defc8c9d1afebb3088bc13e22393a19a688dadb | |
| parent | 1c8020efebac0065f1cf42836cf1c63c063b4960 (diff) | |
experiment with c++0x and ro_data stringsfeature/rodatastrings
| -rw-r--r-- | binfilter/bf_svtools/source/config/svt_inetoptions.cxx | 2 | ||||
| -rw-r--r-- | binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/binfilter/bf_svtools/source/config/svt_inetoptions.cxx b/binfilter/bf_svtools/source/config/svt_inetoptions.cxx index a02de3b00..1e3c4f07e 100644 --- a/binfilter/bf_svtools/source/config/svt_inetoptions.cxx +++ b/binfilter/bf_svtools/source/config/svt_inetoptions.cxx @@ -237,7 +237,7 @@ SvtInetOptions::Impl::notifyListeners( { aEvents.realloc(nCount); aNotifications. - push_back(std::make_pair< List::value_type::first_type, + push_back(std::pair< List::value_type::first_type, List::value_type::second_type >( aIt->first, aEvents)); } diff --git a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx index 0de621084..b6b8063b4 100644 --- a/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx +++ b/binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx @@ -711,13 +711,13 @@ SvxShapeControlPropertyValueMapping[] = // note that order matters: // valueAlignToParaAdjust and valueParaAdjustToAlign search this map from the _beginning_ // and use the first matching entry - {style::ParagraphAdjust_LEFT, (sal_Int16)awt::TextAlign::LEFT}, - {style::ParagraphAdjust_CENTER, (sal_Int16)awt::TextAlign::CENTER}, - {style::ParagraphAdjust_RIGHT, (sal_Int16)awt::TextAlign::RIGHT}, - {style::ParagraphAdjust_BLOCK, (sal_Int16)awt::TextAlign::RIGHT}, - {style::ParagraphAdjust_STRETCH, (sal_Int16)awt::TextAlign::LEFT}, - {style::ParagraphAdjust_MAKE_FIXED_SIZE,(sal_Int16)awt::TextAlign::LEFT}, - {-1,-1} + {(sal_Int16)style::ParagraphAdjust_LEFT, (sal_Int16)awt::TextAlign::LEFT}, + {(sal_Int16)style::ParagraphAdjust_CENTER, (sal_Int16)awt::TextAlign::CENTER}, + {(sal_Int16)style::ParagraphAdjust_RIGHT, (sal_Int16)awt::TextAlign::RIGHT}, + {(sal_Int16)style::ParagraphAdjust_BLOCK, (sal_Int16)awt::TextAlign::RIGHT}, + {(sal_Int16)style::ParagraphAdjust_STRETCH, (sal_Int16)awt::TextAlign::LEFT}, + {(sal_Int16)style::ParagraphAdjust_MAKE_FIXED_SIZE,(sal_Int16)awt::TextAlign::LEFT}, + {(sal_Int16)-1,(sal_Int16)-1} }; void SvxShapeControl::valueAlignToParaAdjust(Any& rValue) |