diff options
Diffstat (limited to 'i18npool/source/paper')
| -rw-r--r-- | i18npool/source/paper/makefile.mk | 4 | ||||
| -rw-r--r-- | i18npool/source/paper/paper.cxx | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/i18npool/source/paper/makefile.mk b/i18npool/source/paper/makefile.mk index fa05cc21f3f9..f0b9bc8b02f1 100644 --- a/i18npool/source/paper/makefile.mk +++ b/i18npool/source/paper/makefile.mk @@ -44,7 +44,11 @@ SLOFILES=$(SLO)$/paper.obj SHL1OBJS=$(SLOFILES) SHL1TARGET=$(TARGET)$(DLLPOSTFIX) +.IF "$(COM)" == "MSC" SHL1IMPLIB=i$(TARGET) +.ELSE +SHL1IMPLIB=$(TARGET)$(DLLPOSTFIX) +.ENDIF DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt SHL1DEF=$(MISC)$/$(SHL1TARGET).def diff --git a/i18npool/source/paper/paper.cxx b/i18npool/source/paper/paper.cxx index 913cc7d834ed..fe376184edba 100644 --- a/i18npool/source/paper/paper.cxx +++ b/i18npool/source/paper/paper.cxx @@ -247,7 +247,7 @@ PaperInfo PaperInfo::getSystemDefaultPaper() // try user-defined locale setting xConfigNA->getByName( CREATE_OUSTRING( "ooSetupSystemLocale" ) ) >>= aLocaleStr; } - catch( Exception& ) + catch(const Exception&) { } @@ -377,7 +377,9 @@ PaperInfo PaperInfo::getSystemDefaultPaper() xConfigNA->getByName( CREATE_OUSTRING( "Locale" ) ) >>= aLocaleStr; } } - catch( Exception& ) {} + catch(const Exception&) + { + } if (aLocaleStr.getLength() == 0) aLocaleStr = CREATE_OUSTRING("en-US"); |