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

[Takeshi Abe]

 sw/source/core/view/printdata.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a41587a7410f300b5225dc15ada2972a79b66322
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Wed Sep 14 05:17:34 2016 +0900

    tdf#102074 Allow to choose page direction on printing brochure
    
    not only for CTL, but also for CJK.
    
    Change-Id: Ic987e6f97a42d66aa859d5da496542ed099eadf0

diff --git a/sw/source/core/view/printdata.cxx b/sw/source/core/view/printdata.cxx
index b64e65c..b238094e 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -167,14 +167,14 @@ SwPrintUIOptions::SwPrintUIOptions(
         return;
     }
 
-    // check if CTL is enabled
+    // check if either CJK or CTL is enabled
     SvtLanguageOptions aLangOpt;
-    bool bCTL = aLangOpt.IsCTLFontEnabled();
+    bool bRTL = aLangOpt.IsCJKFontEnabled() || aLangOpt.IsCTLFontEnabled();
 
     // create sequence of print UI options
     // (5 options are not available for Writer-Web)
-    const int nCTLOpts = bCTL ? 1 : 0;
-    const int nNumProps = nCTLOpts + (bWeb ? 15 : 21);
+    const int nRTLOpts = bRTL ? 1 : 0;
+    const int nNumProps = nRTLOpts + (bWeb ? 15 : 21);
     m_aUIProperties.resize( nNumProps );
     int nIdx = 0;
 
@@ -368,7 +368,7 @@ SwPrintUIOptions::SwPrintUIOptions(
                                                         bDefaultVal,
                                                         aPageSetOpt);
 
-    if (bCTL)
+    if (bRTL)
     {
         // create a bool option for brochure RTL dependent on brochure
         uno::Sequence< OUString > aBRTLChoices( 2 );