summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--binfilter/bf_svtools/source/config/svt_inetoptions.cxx2
-rw-r--r--binfilter/bf_svx/source/unodraw/svx_unoshap2.cxx14
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)