[Libreoffice-commits] core.git: sfx2/source

Krisztian Pinter pin.terminator at gmail.com
Wed Sep 4 04:15:42 PDT 2013


 sfx2/source/dialog/backingwindow.cxx |   80 +++++++++++++++++------------------
 sfx2/source/dialog/backingwindow.hxx |   18 +++----
 2 files changed, 49 insertions(+), 49 deletions(-)

New commits:
commit 055d21a1e32555e1415ac40ba0a931d851a7d8db
Author: Krisztian Pinter <pin.terminator at gmail.com>
Date:   Wed Sep 4 12:59:37 2013 +0200

    startcenter: Rename variables
    
    Change-Id: I3137502e6ee3c4c4dce6ac1b99325f5e8c771e02
    Reviewed-on: https://gerrit.libreoffice.org/5805
    Reviewed-by: Krisztian Pinter <pin.terminator at gmail.com>
    Tested-by: Krisztian Pinter <pin.terminator at gmail.com>

diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index e951291..bece1f6 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -104,15 +104,15 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     get(mpInfoButton,       "info");
     get(mpTplRepButton,     "add_temp");
 
-    get(mpShowWriterTemplateButton,     "show_writer_template");
-    get(mpShowCalcTemplateButton,       "show_calc_template");
-    get(mpShowImpressTemplateButton,    "show_impress_template");
-    get(mpShowDrawTemplateButton,       "show_draw_template");
+    get(mpWriterShowTemplateButton,     "show_writer_template");
+    get(mpCalcShowTemplateButton,       "show_calc_template");
+    get(mpImpressShowTemplateButton,    "show_impress_template");
+    get(mpDrawShowTemplateButton,       "show_draw_template");
 
-    get(mpShowWriterRecentButton,       "show_writer_recent");
-    get(mpShowCalcRecentButton,         "show_calc_recent");
-    get(mpShowImpressRecentButton,      "show_impress_recent");
-    get(mpShowDrawRecentButton,         "show_draw_recent");
+    get(mpWriterShowRecentButton,       "show_writer_recent");
+    get(mpCalcShowRecentButton,         "show_calc_recent");
+    get(mpImpressShowRecentButton,      "show_impress_recent");
+    get(mpDrawShowRecentButton,         "show_draw_recent");
 
     get( mpAllRecentThumbnails,         "all_recent");
     get( mpWriterRecentThumbnails,      "writer_recent");
@@ -279,13 +279,13 @@ void BackingWindow::initControls()
     setupExternalLink( mpTplRepButton );
 
     setupTemplateView( mpWriterTemplateThumbnails,  FILTER_APP_WRITER,
-                       mpShowWriterRecentButton,    mpShowWriterTemplateButton );
+                       mpWriterShowRecentButton,    mpWriterShowTemplateButton );
     setupTemplateView( mpCalcTemplateThumbnails,    FILTER_APP_CALC,
-                       mpShowCalcRecentButton,      mpShowCalcTemplateButton );
+                       mpCalcShowRecentButton,      mpCalcShowTemplateButton );
     setupTemplateView( mpImpressTemplateThumbnails, FILTER_APP_IMPRESS,
-                       mpShowImpressRecentButton,   mpShowImpressTemplateButton );
+                       mpImpressShowRecentButton,   mpImpressShowTemplateButton );
     setupTemplateView( mpDrawTemplateThumbnails,    FILTER_APP_DRAW,
-                       mpShowDrawRecentButton,      mpShowDrawTemplateButton );
+                       mpDrawShowRecentButton,      mpDrawShowTemplateButton );
 
     Resize();
 }
@@ -519,64 +519,64 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*, pButton )
 {
     // writer
-    if( pButton == mpShowWriterTemplateButton )
+    if( pButton == mpWriterShowTemplateButton )
     {
         mpWriterRecentThumbnails->Hide();
+        mpWriterShowTemplateButton->Hide();
         mpWriterTemplateThumbnails->Show();
-        mpShowWriterTemplateButton->Hide();
-        mpShowWriterRecentButton->Show();
+        mpWriterShowRecentButton->Show();
     }
-    else if( pButton == mpShowWriterRecentButton )
+    else if( pButton == mpWriterShowRecentButton )
     {
-        mpWriterRecentThumbnails->Show();
         mpWriterTemplateThumbnails->Hide();
-        mpShowWriterTemplateButton->Show();
-        mpShowWriterRecentButton->Hide();
+        mpWriterShowRecentButton->Hide();
+        mpWriterRecentThumbnails->Show();
+        mpWriterShowTemplateButton->Show();
     }
     // calc
-    else if( pButton == mpShowCalcTemplateButton )
+    else if( pButton == mpCalcShowTemplateButton )
     {
         mpCalcRecentThumbnails->Hide();
+        mpCalcShowTemplateButton->Hide();
         mpCalcTemplateThumbnails->Show();
-        mpShowCalcTemplateButton->Hide();
-        mpShowCalcRecentButton->Show();
+        mpCalcShowRecentButton->Show();
     }
-    else if( pButton == mpShowCalcRecentButton )
+    else if( pButton == mpCalcShowRecentButton )
     {
-        mpCalcRecentThumbnails->Show();
         mpCalcTemplateThumbnails->Hide();
-        mpShowCalcTemplateButton->Show();
-        mpShowCalcRecentButton->Hide();
+        mpCalcShowRecentButton->Hide();
+        mpCalcRecentThumbnails->Show();
+        mpCalcShowTemplateButton->Show();
     }
     // impress
-    else if( pButton == mpShowImpressTemplateButton )
+    else if( pButton == mpImpressShowTemplateButton )
     {
         mpImpressRecentThumbnails->Hide();
+        mpImpressShowTemplateButton->Hide();
         mpImpressTemplateThumbnails->Show();
-        mpShowImpressTemplateButton->Hide();
-        mpShowImpressRecentButton->Show();
+        mpImpressShowRecentButton->Show();
     }
-    else if( pButton == mpShowImpressRecentButton )
+    else if( pButton == mpImpressShowRecentButton )
     {
-        mpImpressRecentThumbnails->Show();
         mpImpressTemplateThumbnails->Hide();
-        mpShowImpressTemplateButton->Show();
-        mpShowImpressRecentButton->Hide();
+        mpImpressShowRecentButton->Hide();
+        mpImpressRecentThumbnails->Show();
+        mpImpressShowTemplateButton->Show();
     }
     // draw
-    else if( pButton == mpShowDrawTemplateButton )
+    else if( pButton == mpDrawShowTemplateButton )
     {
         mpDrawRecentThumbnails->Hide();
+        mpDrawShowTemplateButton->Hide();
         mpDrawTemplateThumbnails->Show();
-        mpShowDrawTemplateButton->Hide();
-        mpShowDrawRecentButton->Show();
+        mpDrawShowRecentButton->Show();
     }
-    else if( pButton == mpShowDrawRecentButton )
+    else if( pButton == mpDrawShowRecentButton )
     {
-        mpDrawRecentThumbnails->Show();
         mpDrawTemplateThumbnails->Hide();
-        mpShowDrawTemplateButton->Show();
-        mpShowDrawRecentButton->Hide();
+        mpDrawShowRecentButton->Hide();
+        mpDrawRecentThumbnails->Show();
+        mpDrawShowTemplateButton->Show();
     }
     return 0;
 }
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 1da5a9a..6f6dffa 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -74,15 +74,15 @@ class BackingWindow
     PushButton*                     mpInfoButton;
     PushButton*                     mpTplRepButton;
 
-    PushButton*                     mpShowWriterTemplateButton;
-    PushButton*                     mpShowCalcTemplateButton;
-    PushButton*                     mpShowImpressTemplateButton;
-    PushButton*                     mpShowDrawTemplateButton;
-
-    PushButton*                     mpShowWriterRecentButton;
-    PushButton*                     mpShowCalcRecentButton;
-    PushButton*                     mpShowImpressRecentButton;
-    PushButton*                     mpShowDrawRecentButton;
+    PushButton*                     mpWriterShowTemplateButton;
+    PushButton*                     mpCalcShowTemplateButton;
+    PushButton*                     mpImpressShowTemplateButton;
+    PushButton*                     mpDrawShowTemplateButton;
+
+    PushButton*                     mpWriterShowRecentButton;
+    PushButton*                     mpCalcShowRecentButton;
+    PushButton*                     mpImpressShowRecentButton;
+    PushButton*                     mpDrawShowRecentButton;
 
     RecentDocsView*                 mpAllRecentThumbnails;
     RecentDocsView*                 mpWriterRecentThumbnails;


More information about the Libreoffice-commits mailing list