diff options
| author | Noel Power <noel.power@novell.com> | 2011-09-25 22:35:19 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2011-09-26 12:06:05 +0100 |
| commit | b778d1a03c0cdf4d0ab0352e08e00ca4d27aef03 (patch) | |
| tree | a6aa41ea3820e54971e3d5ee35776c372344666b | |
| parent | 590d9596c54443dc6b65a811569ec74371fa4794 (diff) | |
fix merge foo and wae
| -rw-r--r-- | filter/source/msfilter/msocximex.cxx | 2 | ||||
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx index 112157237edf..19e217e2dcf6 100644 --- a/filter/source/msfilter/msocximex.cxx +++ b/filter/source/msfilter/msocximex.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star; using namespace ::rtl; -#define WW8_ASCII2STR(s) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(s)) +#define C2U(cChar) rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(cChar)) static char sWW8_form[] = "WW-Standard"; diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index a9e6d3724c59..c78ffdd75e4e 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2247,7 +2247,6 @@ void AxScrollBarModel::convertFromProperties( PropertySet& rPropSet, const Contr if ( rPropSet.getProperty( bRes, PROP_Enabled ) ) setFlag( mnFlags, AX_FLAGS_ENABLED, bRes ); rPropSet.getProperty( mnDelay, PROP_RepeatDelay ); - sal_Int32 nThumbLen = 0; mnPropThumb = AX_PROPTHUMB_ON; // default rConv.convertToMSColor( rPropSet, PROP_SymbolColor, mnArrowColor); rConv.convertToMSColor( rPropSet, PROP_BackgroundColor, mnBackColor ); |