diff options
| author | Carsten Driesner <cd@openoffice.org> | 2010-03-11 12:38:40 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2010-03-11 12:38:40 +0100 |
| commit | 7a214f65446e42fc10e5ec833ecf6f6c1ad4c2bd (patch) | |
| tree | f56099dafa64dda1a60f5e8c2f8c3ba873188d97 | |
| parent | 2978a6d5bd3d7bcdb79ed060280c5afd742073b8 (diff) | |
| parent | c8b8558a1e1160a22142416d892cdc35ea9bb041 (diff) | |
native0: Merge changes
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_dialog2.cxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 4 | ||||
| -rw-r--r-- | framework/source/services/backingwindow.cxx | 7 |
3 files changed, 9 insertions, 4 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index f081f5fda8..21688d51e7 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -94,7 +94,7 @@ using ::rtl::OUString; namespace dp_gui { -#define TOP_OFFSET 3 +#define TOP_OFFSET 5 #define LINE_SIZE 4 #define PROGRESS_WIDTH 60 #define PROGRESS_HEIGHT 14 diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 34dbf23910..6ae6a5f6b8 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -49,10 +49,10 @@ namespace dp_gui { #define SMALL_ICON_SIZE 16 -#define TOP_OFFSET 3 +#define TOP_OFFSET 5 #define ICON_HEIGHT 42 #define ICON_WIDTH 47 -#define ICON_OFFSET 55 +#define ICON_OFFSET 72 #define RIGHT_ICON_OFFSET 5 #define SPACE_BETWEEN 3 diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index 757fd8691b..3ea7ef4157 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -349,7 +349,12 @@ void BackingWindow::initBackground() maOpenText.SetControlBackground( aTextBGColor ); if( mnLayoutStyle == 1 ) - mnBtnPos = maBackgroundLeft.GetSizePixel().Width() + 40; + { + if( Application::GetSettings().GetLayoutRTL() ) + mnBtnPos = maBackgroundRight.GetSizePixel().Width() + 40; + else + mnBtnPos = maBackgroundLeft.GetSizePixel().Width() + 40; + } } void BackingWindow::initControls() |