aAutoDetectionCB is always hidden and always unchecked

Change-Id: Ic8ed8fa3e883da387e8cf0f2bd953081cf75ebc3

4 files changed, 12 insertions, 33 deletions

diff --git a/svx/inc/svx/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx
index 39b4676f1a78..ab670b545613 100644
--- a/svx/inc/svx/rubydialog.hxx
+++ b/svx/inc/svx/rubydialog.hxx
@@ -94,8 +94,6 @@ class SvxRubyDialog : public SfxModelessDialog
     RubyEdit*               aEditArr[8];
     ScrollBar           aScrollSB;
 
-    CheckBox            aAutoDetectionCB;
-
     FixedText           aAdjustFT;
     ListBox             aAdjustLB;
 
@@ -125,7 +123,6 @@ class SvxRubyDialog : public SfxModelessDialog
     DECL_LINK(ApplyHdl_Impl, void *);
     DECL_LINK(CloseHdl_Impl, void *);
     DECL_LINK(StylistHdl_Impl, void *);
-    DECL_LINK(AutomaticHdl_Impl, CheckBox*);
     DECL_LINK(ScrollHdl_Impl, ScrollBar*);
     DECL_LINK(PositionHdl_Impl, ListBox*);
     DECL_LINK(AdjustHdl_Impl, ListBox*);
@@ -161,7 +158,6 @@ class SvxRubyDialog : public SfxModelessDialog
             aLeft4ED.Enable(bEnable);
             aRight4ED.Enable(bEnable);
             aScrollSB.Enable(bEnable);
-            aAutoDetectionCB.Enable(bEnable);
             aAdjustFT.Enable(bEnable);
             aAdjustLB.Enable(bEnable);
             aCharStyleFT.Enable(bEnable);
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index eee5bbeed939..b1698fd2c81e 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -111,12 +111,12 @@ class SvxRubyData_Impl : public cppu::WeakImplHelper1
                                         xSelection = Reference<XRubySelection>(xController, UNO_QUERY);
                                         return xSelection;
                                     }
-    void                            UpdateRubyValues(sal_Bool bAutoUpdate)
+    void                            UpdateRubyValues()
                                     {
                                         if(!xSelection.is())
                                             aRubyValues.realloc(0);
                                         else
-                                            aRubyValues = xSelection->getRubyList(bAutoUpdate);
+                                            aRubyValues = xSelection->getRubyList(false);
                                         bHasSelectionChanged = sal_False;
                                     }
     Sequence<PropertyValues>&       GetRubyValues() {return aRubyValues;}
@@ -152,8 +152,9 @@ void    SvxRubyData_Impl::SetController(Reference<XController> xCtrl)
             if(xSelSupp.is())
                 xSelSupp->addSelectionChangeListener(this);
         }
-        catch(Exception&)
-        {}
+        catch (const Exception&)
+        {
+        }
     }
 }
 //-----------------------------------------------------------------------------
@@ -170,8 +171,9 @@ void SvxRubyData_Impl::disposing( const EventObject&) throw (RuntimeException)
         if(xSelSupp.is())
             xSelSupp->removeSelectionChangeListener(this);
     }
-    catch(Exception&)
-    {}
+    catch (const Exception&)
+    {
+    }
     xController = 0;
 }
 //-----------------------------------------------------------------------------
@@ -206,7 +208,6 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
     aLeft4ED(this,              ResId(ED_LEFT_4,*rResId.GetResMgr()  )),
     aRight4ED(this,             ResId(ED_RIGHT_4,*rResId.GetResMgr() )),
     aScrollSB(this,             ResId(SB_SCROLL,*rResId.GetResMgr()  )),
-    aAutoDetectionCB(this,      ResId(CB_AUTO_DETECT,*rResId.GetResMgr()    )),
     aAdjustFT(this,             ResId(FT_ADJUST,*rResId.GetResMgr()     )),
     aAdjustLB(this,             ResId(LB_ADJUST,*rResId.GetResMgr()     )),
     aPositionFT(this,           ResId(FT_POSITION,*rResId.GetResMgr()     )),
@@ -226,8 +227,6 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
 {
     xImpl = pImpl = new SvxRubyData_Impl;
     FreeResource();
-    // automatic detection not yet available
-    aAutoDetectionCB.Hide();
     aEditArr[0] = &aLeft1ED; aEditArr[1] = &aRight1ED;
     aEditArr[2] = &aLeft2ED; aEditArr[3] = &aRight2ED;
     aEditArr[4] = &aLeft3ED; aEditArr[5] = &aRight3ED;
@@ -236,7 +235,6 @@ SvxRubyDialog::SvxRubyDialog( SfxBindings *pBind, SfxChildWindow *pCW,
     aApplyPB.SetClickHdl(LINK(this, SvxRubyDialog, ApplyHdl_Impl));
     aClosePB.SetClickHdl(LINK(this, SvxRubyDialog, CloseHdl_Impl));
     aStylistPB.SetClickHdl(LINK(this, SvxRubyDialog, StylistHdl_Impl));
-    aAutoDetectionCB.SetClickHdl(LINK(this, SvxRubyDialog, AutomaticHdl_Impl));
     aAdjustLB.SetSelectHdl(LINK(this, SvxRubyDialog, AdjustHdl_Impl));
     aPositionLB.SetSelectHdl(LINK(this, SvxRubyDialog, PositionHdl_Impl));
     aCharStyleLB.SetSelectHdl(LINK(this, SvxRubyDialog, CharStyleHdl_Impl));
@@ -307,7 +305,7 @@ void SvxRubyDialog::Activate()
     {
 
         Reference< XRubySelection > xRubySel = pImpl->GetRubySelection();
-        pImpl->UpdateRubyValues(aAutoDetectionCB.IsChecked());
+        pImpl->UpdateRubyValues();
         EnableControls(xRubySel.is());
         if(xRubySel.is())
         {
@@ -359,7 +357,7 @@ void SvxRubyDialog::Activate()
                         }
                     }
                 }
-                catch(Exception&)
+                catch (const Exception&)
                 {
                     OSL_FAIL("exception in style access");
                 }
@@ -551,9 +549,9 @@ IMPL_LINK_NOARG(SvxRubyDialog, ApplyHdl_Impl)
     {
         try
         {
-            xSelection->setRubyList(aRubyValues, aAutoDetectionCB.IsChecked());
+            xSelection->setRubyList(aRubyValues, false);
         }
-        catch(Exception& )
+        catch (const Exception&)
         {
             OSL_FAIL("Exception caught");
         }
@@ -580,13 +578,6 @@ IMPL_LINK_NOARG(SvxRubyDialog, StylistHdl_Impl)
     return 0;
 }
 
-IMPL_LINK(SvxRubyDialog, AutomaticHdl_Impl, CheckBox*, pBox)
-{
-    pImpl->UpdateRubyValues(pBox->IsChecked());
-    Update();
-    return 0;
-}
-
 IMPL_LINK(SvxRubyDialog, AdjustHdl_Impl, ListBox*, pBox)
 {
     AssertOneEntry();
diff --git a/svx/source/dialog/rubydialog.hrc b/svx/source/dialog/rubydialog.hrc
index 010f98471cb1..d4f4b6c8a400 100644
--- a/svx/source/dialog/rubydialog.hrc
+++ b/svx/source/dialog/rubydialog.hrc
@@ -16,7 +16,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define CB_AUTO_DETECT          1
 #define FT_CHAR_STYLE           2
 #define LB_CHAR_STYLE           3
 #define PB_STYLIST              4
diff --git a/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src
index 8967850edca0..658b793dc061 100644
--- a/svx/source/dialog/rubydialog.src
+++ b/svx/source/dialog/rubydialog.src
@@ -31,13 +31,6 @@ ModelessDialog RID_SVXDLG_RUBY
     Text [ en-US ] = "Asian Phonetic Guide" ;
     Moveable = TRUE ;
     Closeable = TRUE ;
-    CheckBox CB_AUTO_DETECT
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_RUBY:CB_AUTO_DETECT";
-        Pos = MAP_APPFONT ( 6, 6 ) ;
-        Size = MAP_APPFONT ( 186 , 12 ) ;
-        Text [ en-US ] = "Automatic detection";
-    };
     FixedText FT_LEFT
     {
         Pos = MAP_APPFONT ( 6 , 17 ) ;