diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/app/IconThemeSelector.cxx | 15 | ||||
| -rw-r--r-- | vcl/source/fontsubset/cff.cxx | 2 | ||||
| -rw-r--r-- | vcl/source/outdev/bitmap.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/generic/app/i18n_cb.cxx | 9 |
4 files changed, 14 insertions, 16 deletions
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx index cf18f5f2c687..d0454c37fb34 100644 --- a/vcl/source/app/IconThemeSelector.cxx +++ b/vcl/source/app/IconThemeSelector.cxx @@ -51,24 +51,24 @@ IconThemeSelector::IconThemeSelector() /*static*/ OUString IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment) { - OUString r; #ifdef _WIN32 - r = "colibre"; (void)desktopEnvironment; + return OUString("colibre"); #else + OUString r; if ( desktopEnvironment.equalsIgnoreAsciiCase("kde4") || desktopEnvironment.equalsIgnoreAsciiCase("kde5") || desktopEnvironment.equalsIgnoreAsciiCase("lxqt") ) { r = "breeze"; - } else - if ( desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) { + } + else if ( desktopEnvironment.equalsIgnoreAsciiCase("macosx") ) { #if MPL_HAVE_SUBSET r = "tango"; #else r = "breeze"; #endif - } else - if ( desktopEnvironment.equalsIgnoreAsciiCase("gnome") || + } + else if ( desktopEnvironment.equalsIgnoreAsciiCase("gnome") || desktopEnvironment.equalsIgnoreAsciiCase("mate") || desktopEnvironment.equalsIgnoreAsciiCase("unity") ) { r = "elementary"; @@ -76,9 +76,8 @@ IconThemeSelector::GetIconThemeForDesktopEnvironment(const OUString& desktopEnvi { r = FALLBACK_ICON_THEME_ID; } -#endif - return r; +#endif // _WIN32 } OUString diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx index 3c19112a6f72..5f233c13b862 100644 --- a/vcl/source/fontsubset/cff.cxx +++ b/vcl/source/fontsubset/cff.cxx @@ -2002,7 +2002,7 @@ void CffSubsetterContext::emitAsType1( Type1Emitter& rEmitter, "0000000000000000000000000000000000000000000000000000000000000000\n" "cleartomark\n" "\x80\x03"; - if( rEmitter.mbPfbSubset) + if( rEmitter.mbPfbSubset) rEmitter.emitRawData( aPfxFooter, sizeof(aPfxFooter)-1); else rEmitter.emitRawData( aPfxFooter+6, sizeof(aPfxFooter)-9); diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx index fbd4624ce4b8..462b41cda50f 100644 --- a/vcl/source/outdev/bitmap.cxx +++ b/vcl/source/outdev/bitmap.cxx @@ -456,8 +456,8 @@ Bitmap OutputDevice::GetBitmap( const Point& rSrcPt, const Size& rSize ) const } aBmp = aVDev->GetBitmap( Point(), aVDev->GetOutputSizePixel() ); - } - else + } + else bClipped = false; } else diff --git a/vcl/unx/generic/app/i18n_cb.cxx b/vcl/unx/generic/app/i18n_cb.cxx index 0b6cdc49b3dd..6dd8d0915f2d 100644 --- a/vcl/unx/generic/app/i18n_cb.cxx +++ b/vcl/unx/generic/app/i18n_cb.cxx @@ -83,13 +83,12 @@ Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch) int to = from + howmuch; - if (to == static_cast<int>(ptext->nLength)) + if (to == static_cast<int>(ptext->nLength)) { // delete from the end of the text ptext->nLength = from; - } - else - if (to < static_cast<int>(ptext->nLength)) + } + else if (to < static_cast<int>(ptext->nLength)) { // cut out of the middle of the text memmove( static_cast<void*>(ptext->pUnicodeBuffer + from), @@ -99,7 +98,7 @@ Preedit_DeleteText(preedit_text_t *ptext, int from, int howmuch) static_cast<void*>(ptext->pCharStyle + to), (ptext->nLength - to) * sizeof(XIMFeedback)); ptext->nLength -= howmuch; - } + } else { // XXX this indicates an error, are we out of sync ? |