[Libreoffice-commits] core.git: Changes to 'refs/changes/62/1662/3'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/23/2923/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/62/1662/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/23/2923/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/82/3182/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/64/2664/3'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/62/1662/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/04/3704/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/24/3424/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/31/2831/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/04/3704/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/46/3146/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/46/3146/4'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/46/3146/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/67/3167/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/67/3167/3'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/21/3221/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/33/2433/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/73/3773/3'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/64/2664/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/67/3167/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/44/2344/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/28/2728/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/61/1961/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/92/3592/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/49/3549/4'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/73/3773/4'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/24/3424/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/28/2728/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/73/3773/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/72/1972/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/72/1972/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/73/3773/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/49/3549/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/49/3549/3'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/92/3592/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/61/1961/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/49/3549/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/76/2076/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/89/3389/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/89/3389/1'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/76/2076/3'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Changes to 'refs/changes/76/2076/2'

2014-09-29 Thread navin patidar

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fdo#47305: set digit language, before OutputDevice draw text...

2013-05-04 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3773

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/73/3773/1

fdo#47305: set digit language, before OutputDevice draw text.

Set ctl language as digit language when wrt direction is RTL and
numeral language is set to choose based on context.

Change-Id: Ie54193d938e0b6ab6bccb6decb9f245037aebb4b
---
M sc/source/ui/view/output2.cxx
1 file changed, 38 insertions(+), 3 deletions(-)



diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 76d3a5e..dcd6c92 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -38,6 +38,7 @@
 #include editeng/unolingu.hxx
 #include editeng/fontitem.hxx
 #include svl/zforlist.hxx
+#include svl/ctloptions.hxx
 #include svl/zformat.hxx
 #include vcl/svapp.hxx
 #include vcl/metric.hxx
@@ -1650,6 +1651,8 @@
 bNeedEdit = aVars.HasEditCharacters() || (bFormulaCell  
aCell.mpFormula-IsMultilineResult());
 }
 long nTotalMargin = 0;
+const SfxPoolItem* pItem =  mpDoc-GetAttr( nCellX, nCellY, 
nTab, ATTR_WRITINGDIR );
+const SvxFrameDirectionItem* pCurrentWritingMode = (const 
SvxFrameDirectionItem*) pItem;
 if (bDoCell  !bNeedEdit)
 {
 CellType eCellType = aCell.meType;
@@ -1674,8 +1677,6 @@
 
 if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust 
== SVX_HOR_JUSTIFY_REPEAT )
 {
-const SfxPoolItem* pItem =  mpDoc-GetAttr( nCellX, 
nCellY, nTab, ATTR_WRITINGDIR );
-const SvxFrameDirectionItem* pCurrentWritingMode = 
(const SvxFrameDirectionItem*) pItem;
 if (pCurrentWritingMode-GetValue() == 
FRMDIR_HORI_LEFT_TOP)
 eOutHorJust = SVX_HOR_JUSTIFY_LEFT;
 else
@@ -1987,7 +1988,41 @@
 if (bRightAdjusted)
 aDrawTextPos.X() -= aVars.GetOriginalWidth();
 }
-
+SvtCTLOptions *pCTLOptions = new SvtCTLOptions;
+if (pCurrentWritingMode-GetValue() == 
FRMDIR_HORI_RIGHT_TOP  pCTLOptions-GetCTLTextNumerals() == 
SvtCTLOptions::NUMERALS_CONTEXT)
+{
+LanguageType ctl,cjk,latin;
+mpDoc-GetLanguage(latin,cjk,ctl);
+switch(ctl)
+{
+case LANGUAGE_ARABIC_SAUDI_ARABIA:
+{
+mpDev-SetDigitLanguage(ctl);
+break;
+}
+case LANGUAGE_FARSI:
+{
+mpDev-SetDigitLanguage(ctl);
+break;
+}
+case LANGUAGE_URDU_INDIA:
+{
+mpDev-SetDigitLanguage(ctl);
+break;
+}
+case LANGUAGE_URDU_PAKISTAN:
+{
+mpDev-SetDigitLanguage(ctl);
+break;
+}
+case LANGUAGE_URDU:
+{
+mpDev-SetDigitLanguage(ctl);
+break;
+}
+}
+}
+delete pCTLOptions;
 //  in Metafiles immer DrawTextArray, damit die 
Positionen mit
 //  aufgezeichnet werden (fuer nicht-proportionales 
Resize):
 

-- 
To view, visit https://gerrit.libreoffice.org/3773
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie54193d938e0b6ab6bccb6decb9f245037aebb4b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-05-02 Thread navin patidar
 sc/source/ui/view/output2.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 5fc1ba6e6bf22effe4391e22fe94a2ec0fc10100
Author: navin patidar pati...@kacst.edu.sa
Date:   Wed May 1 09:45:58 2013 +0300

fix fdo#64085 : set proper alignment for justified align text.

According to cell writing direction, set alignment for justified align text.

Change-Id: I91e1c52f1aa13a806e2a91dc7120960a4cc3f5c1
Reviewed-on: https://gerrit.libreoffice.org/3704
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index d4fb35f..76d3a5e 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1673,7 +1673,14 @@ void ScOutputData::DrawStrings( sal_Bool bPixelToLogic )
 eOutHorJust = aVars.GetHorJust();
 
 if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust 
== SVX_HOR_JUSTIFY_REPEAT )
-eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is 
not yet implemented
+{
+const SfxPoolItem* pItem =  mpDoc-GetAttr( nCellX, 
nCellY, nTab, ATTR_WRITINGDIR );
+const SvxFrameDirectionItem* pCurrentWritingMode = 
(const SvxFrameDirectionItem*) pItem;
+if (pCurrentWritingMode-GetValue() == 
FRMDIR_HORI_LEFT_TOP)
+eOutHorJust = SVX_HOR_JUSTIFY_LEFT;
+else
+eOutHorJust = SVX_HOR_JUSTIFY_RIGHT;
+}
 
 bool bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust() 
== SVX_HOR_JUSTIFY_BLOCK );
 // #i111387# #o11817313# disable automatic line breaks 
only for General number format
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fix fdo#64085 : set proper alignment for justified align tex...

2013-05-01 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3704

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/04/3704/1

fix fdo#64085 : set proper alignment for justified align text.

According to cell writing direction, set alignment for justified align text.

Change-Id: I91e1c52f1aa13a806e2a91dc7120960a4cc3f5c1
---
M sc/source/ui/view/output2.cxx
1 file changed, 8 insertions(+), 1 deletion(-)



diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index d4fb35f..c16e15f 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -1673,7 +1673,14 @@
 eOutHorJust = aVars.GetHorJust();
 
 if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust 
== SVX_HOR_JUSTIFY_REPEAT )
-eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is 
not yet implemented
+{
+const SfxPoolItem* pItem =  mpDoc-GetAttr( nCellX, 
nCellY, nTab, ATTR_WRITINGDIR );
+const SvxFrameDirectionItem* rCurrentWritingMode = 
(const SvxFrameDirectionItem*) pItem;
+if (rCurrentWritingMode-GetValue() == 
FRMDIR_HORI_LEFT_TOP)
+eOutHorJust = SVX_HOR_JUSTIFY_LEFT;
+else
+eOutHorJust = SVX_HOR_JUSTIFY_RIGHT;
+}
 
 bool bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust() 
== SVX_HOR_JUSTIFY_BLOCK );
 // #i111387# #o11817313# disable automatic line breaks 
only for General number format

-- 
To view, visit https://gerrit.libreoffice.org/3704
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I91e1c52f1aa13a806e2a91dc7120960a4cc3f5c1
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-04-29 Thread navin patidar
 sc/source/ui/view/formatsh.cxx |   55 +++--
 1 file changed, 42 insertions(+), 13 deletions(-)

New commits:
commit 706e3b8e43df94310b2fe8458da67875073a046c
Author: navin patidar pati...@kacst.edu.sa
Date:   Mon Apr 22 10:17:07 2013 +0300

fdo#63546: set appropriate alignment when wrt direction of cells is changed.

Iterate over all selected cells, set appropriate alignment based on
current writing direction and alignment of the cell.

Don’t change alignment when cell is center aligned or justified.
and if alignment is right or left, change it respective to writing 
direction.

Change-Id: Ie98a46af97236ab4303d030f11bd167939dde32b
Reviewed-on: https://gerrit.libreoffice.org/3549
Reviewed-by: Tor Lillqvist t...@iki.fi
Tested-by: Tor Lillqvist t...@iki.fi

diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 3f2b26d..5281d79 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2086,26 +2086,55 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest 
rReq )
 
 pTabViewShell-ApplyAttr( SvxFrameDirectionItem( eDirection, 
ATTR_WRITINGDIR ) );
 
-const SfxItemSet rAttrSet = 
pTabViewShell-GetSelectionPattern()-GetItemSet();
 const SfxPoolItem* pItem = NULL;
 const SvxHorJustifyItem* pHorJustify = NULL;
 SvxCellHorJustify eHorJustify = SVX_HOR_JUSTIFY_STANDARD;
-
-if( rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True, pItem) == 
SFX_ITEM_SET )
+ScRange aRange;
+GetViewData()-GetMarkData().GetMarkArea(aRange);
+ScMarkData  aMark = GetViewData()-GetMarkData();
+ScDocument * pDoc = GetViewData()-GetDocument();
+if (aMark.IsMultiMarked())
 {
-pHorJustify = (const SvxHorJustifyItem*)pItem;
-eHorJustify = SvxCellHorJustify( pHorJustify-GetValue() );
-}
+SCCOL nCol = aRange.aStart.Col();
+SCROW nRow = aRange.aStart.Row();
+for ( ; nCol = aRange.aEnd.Col(); nCol++ )
+{
+for ( ; nRow = aRange.aEnd.Row(); nRow++ )
+{
+pItem = pDoc-GetAttr( nCol, nRow, 
aMark.GetFirstSelected(), ATTR_HOR_JUSTIFY );
+pHorJustify = (const SvxHorJustifyItem*)pItem;
+eHorJustify = SvxCellHorJustify( 
pHorJustify-GetValue() );
 
-if( eHorJustify != SVX_HOR_JUSTIFY_CENTER  eHorJustify != 
SVX_HOR_JUSTIFY_BLOCK )
+if( eHorJustify != SVX_HOR_JUSTIFY_CENTER  
eHorJustify != SVX_HOR_JUSTIFY_BLOCK )
+{
+if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
+pDoc-ApplyAttr( nCol, nRow, 
aMark.GetFirstSelected(), SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT, 
ATTR_HOR_JUSTIFY ) );
+else
+pDoc-ApplyAttr( nCol, nRow, 
aMark.GetFirstSelected(), SvxHorJustifyItem( SVX_HOR_JUSTIFY_RIGHT, 
ATTR_HOR_JUSTIFY ) );
+}
+}
+nRow = 0;
+}
+}
+else
 {
-if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
- rReq.AppendItem( SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT, 
SID_H_ALIGNCELL ) );
-else
- rReq.AppendItem( SvxHorJustifyItem( 
SVX_HOR_JUSTIFY_RIGHT, SID_H_ALIGNCELL ) );
+const SfxItemSet rAttrSet = 
pTabViewShell-GetSelectionPattern()-GetItemSet();
+if( rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True, pItem) 
== SFX_ITEM_SET )
+{
+pHorJustify = (const SvxHorJustifyItem*)pItem;
+eHorJustify = SvxCellHorJustify( pHorJustify-GetValue() );
+}
 
-rReq.SetSlot( SID_H_ALIGNCELL );
-ExecuteSlot( rReq, GetInterface() );
+if( eHorJustify != SVX_HOR_JUSTIFY_CENTER  eHorJustify != 
SVX_HOR_JUSTIFY_BLOCK )
+{
+if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
+ rReq.AppendItem( SvxHorJustifyItem( 
SVX_HOR_JUSTIFY_LEFT, SID_H_ALIGNCELL ) );
+else
+ rReq.AppendItem( SvxHorJustifyItem( 
SVX_HOR_JUSTIFY_RIGHT, SID_H_ALIGNCELL ) );
+
+rReq.SetSlot( SID_H_ALIGNCELL );
+ExecuteSlot( rReq, GetInterface() );
+}
 }
 
 pDocSh-GetUndoManager()-LeaveListAction();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[ABANDONED] make use of pOutWin, which is member of ImpEditView class.

2013-04-28 Thread navin patidar (via Code Review)
navin patidar has abandoned this change.

Change subject: make use of pOutWin, which is member of ImpEditView class.
..


Patch Set 2: Abandoned

dynamic cast produces pOutWin only when pTargetDevice is NULL for 
ImpEditEngine::Paint( ImpEditView* pView, const Rectangle rRect, OutputDevice* 
pTargetDevice, sal_Bool bUseVirtDev )
.

-- 
To view, visit https://gerrit.libreoffice.org/3592
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I78218572abe06f189eb20ba341c4de3aced8df61
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa
Gerrit-Reviewer: Fridrich Strba fridr...@documentfoundation.org
Gerrit-Reviewer: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] make use of pOutWin, which is member of ImpEditView class.

2013-04-24 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3592

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/92/3592/1

make use of pOutWin, which is member of ImpEditView class.

Change-Id: I78218572abe06f189eb20ba341c4de3aced8df61
---
M editeng/source/editeng/impedit.cxx
1 file changed, 2 insertions(+), 4 deletions(-)



diff --git a/editeng/source/editeng/impedit.cxx 
b/editeng/source/editeng/impedit.cxx
index 7525db9..a8a0508 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -318,11 +318,9 @@
 }
 else
 {
-Window* pWindow = dynamic_cast Window* (_pTarget);
-
-if(pWindow)
+if(pOutWin)
 {
-pWindow-Invert( aRect );
+pOutWin-Invert( aRect );
 }
 else
 {

-- 
To view, visit https://gerrit.libreoffice.org/3592
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78218572abe06f189eb20ba341c4de3aced8df61
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] related to fdo#63546.

2013-04-22 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3549

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/49/3549/1

related to fdo#63546.

set appropriate alignment when wrt direction of selected cells is changed.

Change-Id: Ie98a46af97236ab4303d030f11bd167939dde32b
---
M sc/source/ui/view/formatsh.cxx
1 file changed, 41 insertions(+), 13 deletions(-)



diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 3f2b26d..3f54bcb 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2086,26 +2086,54 @@
 
 pTabViewShell-ApplyAttr( SvxFrameDirectionItem( eDirection, 
ATTR_WRITINGDIR ) );
 
-const SfxItemSet rAttrSet = 
pTabViewShell-GetSelectionPattern()-GetItemSet();
 const SfxPoolItem* pItem = NULL;
 const SvxHorJustifyItem* pHorJustify = NULL;
 SvxCellHorJustify eHorJustify = SVX_HOR_JUSTIFY_STANDARD;
-
-if( rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True, pItem) == 
SFX_ITEM_SET )
+ScRange aRange;
+GetViewData()-GetMarkData().GetMarkArea(aRange);
+ScMarkData  aMark = GetViewData()-GetMarkData();
+ScDocument * pDoc = GetViewData()-GetDocument();
+if (aMark.IsMultiMarked())
 {
-pHorJustify = (const SvxHorJustifyItem*)pItem;
-eHorJustify = SvxCellHorJustify( pHorJustify-GetValue() );
+int i = 0, j = 0;
+for ( ; aRange.aStart.Col()+i = aRange.aEnd.Col() ; i++ )
+{
+for ( ; aRange.aStart.Row()+j = aRange.aEnd.Row() ; j++ )
+{
+pItem = pDoc-GetAttr( aRange.aStart.Col()+i, 
aRange.aStart.Row()+j, aMark.GetFirstSelected(), ATTR_HOR_JUSTIFY );
+pHorJustify = (const SvxHorJustifyItem*)pItem;
+eHorJustify = SvxCellHorJustify( 
pHorJustify-GetValue() );
+
+if( eHorJustify != SVX_HOR_JUSTIFY_CENTER  
eHorJustify != SVX_HOR_JUSTIFY_BLOCK )
+{
+if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
+pDoc-ApplyAttr( aRange.aStart.Col()+i, 
aRange.aStart.Row()+j, aMark.GetFirstSelected(), SvxHorJustifyItem( 
SVX_HOR_JUSTIFY_LEFT, ATTR_HOR_JUSTIFY ) );
+else
+pDoc-ApplyAttr( aRange.aStart.Col()+i, 
aRange.aStart.Row()+j, aMark.GetFirstSelected(), SvxHorJustifyItem( 
SVX_HOR_JUSTIFY_RIGHT, ATTR_HOR_JUSTIFY ) );
+}
+}
+j = 0;
+}
 }
-
-if( eHorJustify != SVX_HOR_JUSTIFY_CENTER  eHorJustify != 
SVX_HOR_JUSTIFY_BLOCK )
+else
 {
-if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
- rReq.AppendItem( SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT, 
SID_H_ALIGNCELL ) );
-else
- rReq.AppendItem( SvxHorJustifyItem( 
SVX_HOR_JUSTIFY_RIGHT, SID_H_ALIGNCELL ) );
+const SfxItemSet rAttrSet = 
pTabViewShell-GetSelectionPattern()-GetItemSet();
+if( rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True, pItem) 
== SFX_ITEM_SET )
+{
+pHorJustify = (const SvxHorJustifyItem*)pItem;
+eHorJustify = SvxCellHorJustify( pHorJustify-GetValue() );
+}
 
-rReq.SetSlot( SID_H_ALIGNCELL );
-ExecuteSlot( rReq, GetInterface() );
+if( eHorJustify != SVX_HOR_JUSTIFY_CENTER  eHorJustify != 
SVX_HOR_JUSTIFY_BLOCK )
+{
+if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
+ rReq.AppendItem( SvxHorJustifyItem( 
SVX_HOR_JUSTIFY_LEFT, SID_H_ALIGNCELL ) );
+else
+ rReq.AppendItem( SvxHorJustifyItem( 
SVX_HOR_JUSTIFY_RIGHT, SID_H_ALIGNCELL ) );
+
+rReq.SetSlot( SID_H_ALIGNCELL );
+ExecuteSlot( rReq, GetInterface() );
+}
 }
 
 pDocSh-GetUndoManager()-LeaveListAction();

-- 
To view, visit https://gerrit.libreoffice.org/3549
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie98a46af97236ab4303d030f11bd167939dde32b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-04-18 Thread navin patidar
 sc/source/ui/view/formatsh.cxx |   23 +++
 1 file changed, 23 insertions(+)

New commits:
commit 16f508686c29bfa244ca6f81b5ab3bbaf5fef2a7
Author: navin patidar pati...@kacst.edu.sa
Date:   Mon Apr 15 12:59:12 2013 +0300

fix fdo#63546 : set appropriate alignment when writing direction is changed.

Change-Id: I3aa22be6ae85b6f18ed48e3ffd6abc5102a2e92e
Reviewed-on: https://gerrit.libreoffice.org/3424
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com

diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index f93849d..c4e7e40 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2084,6 +2084,29 @@ void ScFormatShell::ExecuteTextDirection( SfxRequest 
rReq )
 SvxFrameDirection eDirection = ( nSlot == 
SID_ATTR_PARA_LEFT_TO_RIGHT ) ?
 FRMDIR_HORI_LEFT_TOP : 
FRMDIR_HORI_RIGHT_TOP;
 pTabViewShell-ApplyAttr( SvxFrameDirectionItem( eDirection, 
ATTR_WRITINGDIR ) );
+
+const SfxItemSet rAttrSet = 
pTabViewShell-GetSelectionPattern()-GetItemSet();
+const SfxPoolItem* pItem = NULL;
+const SvxHorJustifyItem* pHorJustify = NULL;
+SvxCellHorJustify eHorJustify = SVX_HOR_JUSTIFY_STANDARD;
+
+if( rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True, pItem) == 
SFX_ITEM_SET )
+{
+pHorJustify = (const SvxHorJustifyItem*)pItem;
+eHorJustify = SvxCellHorJustify( pHorJustify-GetValue() );
+}
+
+if( eHorJustify != SVX_HOR_JUSTIFY_CENTER  eHorJustify != 
SVX_HOR_JUSTIFY_BLOCK )
+{
+if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
+ rReq.AppendItem( SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT, 
SID_H_ALIGNCELL ) );
+else
+ rReq.AppendItem( SvxHorJustifyItem( 
SVX_HOR_JUSTIFY_RIGHT, SID_H_ALIGNCELL ) );
+
+rReq.SetSlot( SID_H_ALIGNCELL );
+ExecuteSlot( rReq, GetInterface() );
+}
+
 }
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fix fdo#63546 : set appropriate alignment when writing direc...

2013-04-17 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3424

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/24/3424/1

fix fdo#63546 : set appropriate alignment when writing direction is changed.

Change-Id: I3aa22be6ae85b6f18ed48e3ffd6abc5102a2e92e
---
M sc/source/ui/view/formatsh.cxx
1 file changed, 23 insertions(+), 0 deletions(-)



diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 20b0c99..a19f5cb 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -2052,6 +2052,29 @@
 SvxFrameDirection eDirection = ( nSlot == 
SID_ATTR_PARA_LEFT_TO_RIGHT ) ?
 FRMDIR_HORI_LEFT_TOP : 
FRMDIR_HORI_RIGHT_TOP;
 pTabViewShell-ApplyAttr( SvxFrameDirectionItem( eDirection, 
ATTR_WRITINGDIR ) );
+
+const SfxItemSet rAttrSet = 
pTabViewShell-GetSelectionPattern()-GetItemSet();
+const SfxPoolItem* pItem = NULL;
+const SvxHorJustifyItem* pHorJustify = NULL;
+SvxCellHorJustify eHorJustify = SVX_HOR_JUSTIFY_STANDARD;
+
+if( rAttrSet.GetItemState(ATTR_HOR_JUSTIFY, sal_True, pItem) == 
SFX_ITEM_SET )
+{
+pHorJustify = (const SvxHorJustifyItem*)pItem;
+eHorJustify = SvxCellHorJustify( pHorJustify-GetValue() );
+}
+
+if( eHorJustify != SVX_HOR_JUSTIFY_CENTER )
+{
+if( nSlot == SID_ATTR_PARA_LEFT_TO_RIGHT )
+ rReq.AppendItem( SvxHorJustifyItem( SVX_HOR_JUSTIFY_LEFT, 
SID_H_ALIGNCELL ) );
+else
+ rReq.AppendItem( SvxHorJustifyItem( 
SVX_HOR_JUSTIFY_RIGHT, SID_H_ALIGNCELL ) );
+
+rReq.SetSlot( SID_H_ALIGNCELL );
+ExecuteSlot( rReq, GetInterface() );
+}
+
 }
 break;
 }

-- 
To view, visit https://gerrit.libreoffice.org/3424
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3aa22be6ae85b6f18ed48e3ffd6abc5102a2e92e
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] use ImpEditEngine::ImplInitDigitModel() to set digit languag...

2013-04-15 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3389

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/89/3389/1

use ImpEditEngine::ImplInitDigitModel() to set digit language.

Change-Id: I38047da8cb73493916803d73e1036dec68ee2d97
---
M editeng/source/editeng/impedit3.cxx
1 file changed, 2 insertions(+), 13 deletions(-)



diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 1299920e8..92bb45a 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4320,19 +4320,8 @@
 
 // #114278# Also setting up digit language from Svt options
 // (cannot reliably inherit the outdev's setting)
-LanguageType eLang;
-
-if( !pCTLOptions )
-pCTLOptions = new SvtCTLOptions;
-
-if ( SvtCTLOptions::NUMERALS_HINDI == pCTLOptions-GetCTLTextNumerals() )
-eLang = LANGUAGE_ARABIC_SAUDI_ARABIA;
-else if ( SvtCTLOptions::NUMERALS_ARABIC == 
pCTLOptions-GetCTLTextNumerals() )
-eLang = LANGUAGE_ENGLISH;
-else
-eLang = (LanguageType) 
Application::GetSettings().GetLanguageTag().getLanguageType();
-
-pOutDev-SetDigitLanguage( eLang );
+LanguageType eLang = (LanguageType) 
Application::GetSettings().GetLanguageTag().getLanguageType();
+ImplInitDigitMode( pOutDev, eLang );
 }
 
 Reference  i18n::XBreakIterator  ImpEditEngine::ImplGetBreakIterator() const

-- 
To view, visit https://gerrit.libreoffice.org/3389
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38047da8cb73493916803d73e1036dec68ee2d97
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-04-15 Thread navin patidar
 editeng/source/editeng/impedit3.cxx |   15 ++-
 1 file changed, 2 insertions(+), 13 deletions(-)

New commits:
commit 1e7bc069056518e216be7765796dff26ba06bb32
Author: navin patidar pati...@kacst.edu.sa
Date:   Mon Apr 15 10:24:46 2013 +0300

use ImpEditEngine::ImplInitDigitModel() to set digit language.

Change-Id: I38047da8cb73493916803d73e1036dec68ee2d97
Reviewed-on: https://gerrit.libreoffice.org/3389
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 1299920e8..92bb45a 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4320,19 +4320,8 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* 
pOutDev, sal_uInt16 nPara,
 
 // #114278# Also setting up digit language from Svt options
 // (cannot reliably inherit the outdev's setting)
-LanguageType eLang;
-
-if( !pCTLOptions )
-pCTLOptions = new SvtCTLOptions;
-
-if ( SvtCTLOptions::NUMERALS_HINDI == pCTLOptions-GetCTLTextNumerals() )
-eLang = LANGUAGE_ARABIC_SAUDI_ARABIA;
-else if ( SvtCTLOptions::NUMERALS_ARABIC == 
pCTLOptions-GetCTLTextNumerals() )
-eLang = LANGUAGE_ENGLISH;
-else
-eLang = (LanguageType) 
Application::GetSettings().GetLanguageTag().getLanguageType();
-
-pOutDev-SetDigitLanguage( eLang );
+LanguageType eLang = (LanguageType) 
Application::GetSettings().GetLanguageTag().getLanguageType();
+ImplInitDigitMode( pOutDev, eLang );
 }
 
 Reference  i18n::XBreakIterator  ImpEditEngine::ImplGetBreakIterator() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: vcl/inc vcl/source

2013-04-08 Thread navin patidar
 vcl/inc/graphite_layout.hxx   |1 +
 vcl/source/glyphs/graphite_layout.cxx |   23 +--
 2 files changed, 22 insertions(+), 2 deletions(-)

New commits:
commit 83d9c5562c27b5f766157eba70bebd320463a0af
Author: navin patidar pati...@kacst.edu.sa
Date:   Sun Apr 7 11:47:01 2013 +0300

fix fdo#60534 : use DefaultCharMapper::mapChar() to map RTL string unicodes.

Use DefaultCharMapper::mapChar() to map RTL string unicodes
to their mirror compatible  unicodes.

Change-Id: I5bd2fd18bf96c49bbdf2be521a9cf28c311c7a09
Reviewed-on: https://gerrit.libreoffice.org/3221
Reviewed-by: Miklos Vajna vmik...@suse.cz
Tested-by: Miklos Vajna vmik...@suse.cz

diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index bbf6f15..fa6d25c 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -97,6 +97,7 @@ public:
 private:
 const gr_face * mpFace; // not owned by layout
 gr_font *   mpFont; // not owned by layout
+sal_Unicode *   mpStr;
 int mnSegCharOffset; // relative to 
ImplLayoutArgs::mpStr
 longmnWidth;
 std::vectorintmvChar2BaseGlyph;
diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 8b19c31..3e3c329 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -48,6 +48,7 @@
 #include unicode/ubidi.h
 #include unicode/uscript.h
 
+#include layout/DefaultCharMapper.h
 // Graphite Libraries (must be after vcl headers on windows)
 #include graphite2/Segment.h
 
@@ -490,6 +491,7 @@ GraphiteLayout::GraphiteLayout(const gr_face * face, 
gr_font * font,
const grutils::GrFeatureParser * pFeatures) 
throw()
   : mpFace(face),
 mpFont(font),
+mpStr(NULL),
 mnWidth(0),
 mfScaling(1.0),
 mpFeatures(pFeatures)
@@ -501,6 +503,7 @@ GraphiteLayout::~GraphiteLayout() throw()
 {
 clear();
 // the features and font are owned by the platform layers
+delete[] mpStr;
 mpFeatures = NULL;
 mpFont = NULL;
 }
@@ -591,12 +594,28 @@ gr_segment * 
GraphiteLayout::CreateSegment(ImplLayoutArgs rArgs)
 }
 size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+
+mpStr = new sal_Unicode[rArgs.mnLength+1];
+if(mpStr)
+memcpy(mpStr, rArgs.mpStr, (rArgs.mnLength+1)*2);
+
+if (bRtl  mpStr)
+{
+DefaultCharMapper cmap(true, bRtl);
+int i=0;
+while(rArgs.mpStr[i])
+{
+mpStr[i]=(sal_Unicode) 
cmap.mapChar((sal_uInt32)rArgs.mpStr[i]);
+i++;
+}
+}
+
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
-rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
+mpStr + mnSegCharOffset, numchars, 
bRtl);
 else
 pSegment = gr_make_seg(mpFont, mpFace, 0, NULL, gr_utf16,
-rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
+mpStr + mnSegCharOffset, numchars, 
bRtl);
 
 //pSegment = new gr::RangeSegment((gr::Font *)mrFont, mpTextSrc, 
maLayout, mnMinCharPos, limit);
 if (pSegment != NULL)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fix fdo#60534 : use DefaultCharMapper::mapChar() to map RTL ...

2013-04-07 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3221

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/21/3221/1

fix fdo#60534 : use DefaultCharMapper::mapChar() to map RTL string unicodes.

Use DefaultCharMapper::mapChar() to map RTL string unicodes
to their mirror compatible  unicodes.

Change-Id: I5bd2fd18bf96c49bbdf2be521a9cf28c311c7a09
---
M vcl/inc/graphite_layout.hxx
M vcl/source/glyphs/graphite_layout.cxx
2 files changed, 22 insertions(+), 2 deletions(-)



diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx
index bbf6f15..fa6d25c 100644
--- a/vcl/inc/graphite_layout.hxx
+++ b/vcl/inc/graphite_layout.hxx
@@ -97,6 +97,7 @@
 private:
 const gr_face * mpFace; // not owned by layout
 gr_font *   mpFont; // not owned by layout
+sal_Unicode *   mpStr;
 int mnSegCharOffset; // relative to 
ImplLayoutArgs::mpStr
 longmnWidth;
 std::vectorintmvChar2BaseGlyph;
diff --git a/vcl/source/glyphs/graphite_layout.cxx 
b/vcl/source/glyphs/graphite_layout.cxx
index 8b19c31..3e3c329 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.cxx
@@ -48,6 +48,7 @@
 #include unicode/ubidi.h
 #include unicode/uscript.h
 
+#include layout/DefaultCharMapper.h
 // Graphite Libraries (must be after vcl headers on windows)
 #include graphite2/Segment.h
 
@@ -490,6 +491,7 @@
const grutils::GrFeatureParser * pFeatures) 
throw()
   : mpFace(face),
 mpFont(font),
+mpStr(NULL),
 mnWidth(0),
 mfScaling(1.0),
 mpFeatures(pFeatures)
@@ -501,6 +503,7 @@
 {
 clear();
 // the features and font are owned by the platform layers
+delete[] mpStr;
 mpFeatures = NULL;
 mpFont = NULL;
 }
@@ -591,12 +594,28 @@
 }
 size_t numchars = gr_count_unicode_characters(gr_utf16, rArgs.mpStr + 
mnSegCharOffset,
 rArgs.mpStr + (rArgs.mnLength  limit + 64 ? limit + 64 : 
rArgs.mnLength), NULL);
+
+mpStr = new sal_Unicode[rArgs.mnLength+1];
+if(mpStr)
+memcpy(mpStr, rArgs.mpStr, (rArgs.mnLength+1)*2);
+
+if (bRtl  mpStr)
+{
+DefaultCharMapper cmap(true, bRtl);
+int i=0;
+while(rArgs.mpStr[i])
+{
+mpStr[i]=(sal_Unicode) 
cmap.mapChar((sal_uInt32)rArgs.mpStr[i]);
+i++;
+}
+}
+
 if (mpFeatures)
 pSegment = gr_make_seg(mpFont, mpFace, 0, mpFeatures-values(), 
gr_utf16,
-rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
+mpStr + mnSegCharOffset, numchars, 
bRtl);
 else
 pSegment = gr_make_seg(mpFont, mpFace, 0, NULL, gr_utf16,
-rArgs.mpStr + mnSegCharOffset, 
numchars, bRtl);
+mpStr + mnSegCharOffset, numchars, 
bRtl);
 
 //pSegment = new gr::RangeSegment((gr::Font *)mrFont, mpTextSrc, 
maLayout, mnMinCharPos, limit);
 if (pSegment != NULL)

-- 
To view, visit https://gerrit.libreoffice.org/3221
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5bd2fd18bf96c49bbdf2be521a9cf28c311c7a09
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] fix fdo#40496: don't reset RES_FRAMEDIR attribute.

2013-04-03 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3182

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/3182/1

fix fdo#40496: don't reset  RES_FRAMEDIR attribute.

fix regression introduced by bb920862c02047471f0ac5e78358e8d8fd9b93e7 commit

discussed here :
https://bugs.freedesktop.org/show_bug.cgi?id=40496#c13

choosing correct default alignment for RTL text need some discussion.

Change-Id: I2aec9391d076af6d5fbf00ba5bdad030ac0286ed
---
M sw/source/ui/shells/textsh1.cxx
1 file changed, 1 insertion(+), 2 deletions(-)



diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 395c7d8..e92cde6 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -499,9 +499,8 @@
 aAttribs.insert( aAttribs.end(), nE++ );
 pUShorts += 2;
 }
-// we don't want to change writing direction and text alignment.
+// we don't want to change writing direction.
 aAttribs.erase( RES_FRAMEDIR );
-aAttribs.erase( RES_PARATR_ADJUST );
 rWrtSh.ResetAttr( aAttribs );
 rReq.Done();
 break;

-- 
To view, visit https://gerrit.libreoffice.org/3182
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2aec9391d076af6d5fbf00ba5bdad030ac0286ed
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-04-03 Thread navin patidar
 sw/source/ui/shells/textsh1.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit d0cfbb882c4c00fea4858f9d4b2511df66dd087b
Author: navin patidar pati...@kacst.edu.sa
Date:   Wed Apr 3 11:51:40 2013 +0300

fix fdo#40496: don't reset  RES_FRAMEDIR attribute.

fix regression introduced by bb920862c02047471f0ac5e78358e8d8fd9b93e7 commit

discussed here :
https://bugs.freedesktop.org/show_bug.cgi?id=40496#c13

choosing correct default alignment for RTL text need some discussion.

Change-Id: I2aec9391d076af6d5fbf00ba5bdad030ac0286ed
Reviewed-on: https://gerrit.libreoffice.org/3182
Reviewed-by: Lior Kaplan kaplanl...@gmail.com
Tested-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 395c7d8..e92cde6 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -499,9 +499,8 @@ void SwTextShell::Execute(SfxRequest rReq)
 aAttribs.insert( aAttribs.end(), nE++ );
 pUShorts += 2;
 }
-// we don't want to change writing direction and text alignment.
+// we don't want to change writing direction.
 aAttribs.erase( RES_FRAMEDIR );
-aAttribs.erase( RES_PARATR_ADJUST );
 rWrtSh.ResetAttr( aAttribs );
 rReq.Done();
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] remove unused code.

2013-04-02 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3167

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/67/3167/1

remove unused code.

A request (rReq) having anyone of following SID
SID_ATTR_CHAR_FONTHEIGHT, SID_ATTR_CHAR_FONT,SID_ATTR_CHAR_COLOR
doesn’t have a NULL pArgs .

that’s why execution control never enters into
drtxtob1.cxx:349 - if( !pArgs ) block of code
for a request (rReq) having anyone of mentioned SIDs.

Change-Id: I77945dd81108b3e0d3282fa7547311868f0bafae
---
M sd/source/ui/view/drtxtob1.cxx
1 file changed, 0 insertions(+), 32 deletions(-)



diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 4163ff1..e8e1179 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -476,38 +476,6 @@
 aNewAttr.Put( aItem );
 }
 break;
-
-// attributes for TextObjectBar
-case SID_ATTR_CHAR_FONT:
-{
-if( pArgs )
-{
-if( SFX_ITEM_SET == pArgs-GetItemState( 
EE_CHAR_FONTINFO, sal_True, pPoolItem ) )
-aNewAttr.Put( *pPoolItem );
-}
-else
-mpViewShell-GetViewFrame()-GetDispatcher()-
-Execute( SID_CHAR_DLG, SFX_CALLMODE_ASYNCHRON );
-}
-break;
-case SID_ATTR_CHAR_FONTHEIGHT:
-{
-if( pArgs )
-{
-if( SFX_ITEM_SET == pArgs-GetItemState( 
EE_CHAR_FONTHEIGHT, sal_True, pPoolItem ) )
-aNewAttr.Put( *pPoolItem );
-}
-else
-mpViewShell-GetViewFrame()-GetDispatcher()-
-Execute( SID_CHAR_DLG, SFX_CALLMODE_ASYNCHRON );
-}
-break;
-case SID_ATTR_CHAR_COLOR:
-{
-if( pArgs  SFX_ITEM_SET == pArgs-GetItemState( 
EE_CHAR_COLOR, sal_True, pPoolItem ) )
-aNewAttr.Put( *pPoolItem );
-}
-break;
 // #i35937# removed need for FN_NUM_BULLET_ON handling
 }
 

-- 
To view, visit https://gerrit.libreoffice.org/3167
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77945dd81108b3e0d3282fa7547311868f0bafae
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-04-02 Thread navin patidar
 sw/source/ui/shells/textsh1.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit bb920862c02047471f0ac5e78358e8d8fd9b93e7
Author: navin patidar pati...@kacst.edu.sa
Date:   Mon Apr 1 10:06:12 2013 +0300

fix fdo#40496: don't reset RES_PARATR_ADJUST  RES_FRAMEDIR attributes.

Change-Id: I69298632d56decbce3eb7058b982d845cb3e7240
Reviewed-on: https://gerrit.libreoffice.org/3146
Reviewed-by: Bosdonnat Cedric cedric.bosdon...@free.fr
Tested-by: Bosdonnat Cedric cedric.bosdon...@free.fr

diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 01cb635..395c7d8 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -499,7 +499,9 @@ void SwTextShell::Execute(SfxRequest rReq)
 aAttribs.insert( aAttribs.end(), nE++ );
 pUShorts += 2;
 }
-
+// we don't want to change writing direction and text alignment.
+aAttribs.erase( RES_FRAMEDIR );
+aAttribs.erase( RES_PARATR_ADJUST );
 rWrtSh.ResetAttr( aAttribs );
 rReq.Done();
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fix 40496: don't reset RES_PARATR_ADJUST RES_FRAMEDIR attr...

2013-04-01 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/3146

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/46/3146/1

fix 40496: don't reset RES_PARATR_ADJUST  RES_FRAMEDIR attributes.

Change-Id: I69298632d56decbce3eb7058b982d845cb3e7240
---
M sw/source/ui/shells/textsh1.cxx
1 file changed, 4 insertions(+), 2 deletions(-)



diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 830d510..6b82ff6 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -495,10 +495,12 @@
 sal_uInt16 nL = pUShorts[1] - pUShorts[0] + 1;
 sal_uInt16 nE = pUShorts[0];
 for (sal_uInt16 i = 0; i  nL; ++i)
-aAttribs.insert( aAttribs.end(), nE++ );
+aAttribs.insert( aAttribs.end(), nE++ );
 pUShorts += 2;
 }
-
+// we don't want to change writing direction and text alignment.
+aAttribs.erase( RES_FRAMEDIR );
+aAttribs.erase( RES_PARATR_ADJUST );
 rWrtSh.ResetAttr( aAttribs );
 rReq.Done();
 break;

-- 
To view, visit https://gerrit.libreoffice.org/3146
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69298632d56decbce3eb7058b982d845cb3e7240
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sd/source sw/source

2013-03-25 Thread navin patidar
 sd/source/ui/annotations/annotationwindow.cxx |5 +
 sw/source/ui/docvw/SidebarWin.cxx |5 +
 2 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit d91b5e739128cd8f4c3ef86c17cd723d5b292a2d
Author: navin patidar pati...@kacst.edu.sa
Date:   Tue Mar 19 08:58:22 2013 +0300

fix fdo#62050 : Initially disable RTL for comment window.

In RTL UI, comment window is RTL and editbox’s (editeng) default writing
direction is LTR.
and i suspect, the bug is result of this RTL  LTR mix-up.

Change-Id: If3af4ae428b67151d1907b9e60a97049e0e6
Reviewed-on: https://gerrit.libreoffice.org/2831
Reviewed-by: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
(cherry picked from commit 79dd315e9b19ec3bc6601c359a0ecb6d576d4aa8)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

fix fdo#62050: for impress

Impress is also affected by fdo#62050.
In RTL UI, comment window is RTL and editbox’s (editeng) default
writing direction is LTR.
I suspect, bug is result of this RTL  LTR mix-up.

Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf
Reviewed-on: https://gerrit.libreoffice.org/2922
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
(cherry picked from commit 092bf2fb0052ca73855127dc03ff1ae3f9321506)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/sd/source/ui/annotations/annotationwindow.cxx 
b/sd/source/ui/annotations/annotationwindow.cxx
index d217cbf..6573ea0 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -327,15 +327,12 @@ void AnnotationWindow::InitControls()
 mpOutliner-SetRefDevice( pDev );
 }
 
+mpTextWindow-EnableRTL( sal_False );
 mpOutlinerView = new OutlinerView ( mpOutliner, mpTextWindow );
 mpOutliner-InsertView(mpOutlinerView );
 mpTextWindow-SetOutlinerView(mpOutlinerView);
 mpOutlinerView-SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) );
 
-// TODO: ??
-EEHorizontalTextDirection aDefHoriTextDir = 
Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R;
-mpOutliner-SetDefaultHorizontalTextDirection( aDefHoriTextDir );
-
 //create Scrollbars
 mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);
 mpVScrollbar-EnableNativeWidget(false);
diff --git a/sw/source/ui/docvw/SidebarWin.cxx 
b/sw/source/ui/docvw/SidebarWin.cxx
index 8ad2c15..c0417ad 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -320,6 +320,7 @@ void SwSidebarWin::InitControls()
 mpOutliner-SetUpdateMode( sal_True );
 Rescale();
 
+mpSidebarTxtControl-EnableRTL( sal_False );
 mpOutlinerView = new OutlinerView ( mpOutliner, mpSidebarTxtControl );
 mpOutlinerView-SetBackgroundColor(COL_TRANSPARENT);
 mpOutliner-InsertView(mpOutlinerView );
@@ -327,10 +328,6 @@ void SwSidebarWin::InitControls()
 
 mpOutlinerView-SetAttribs(DefaultItem());
 
-// TODO: ??
-EEHorizontalTextDirection aDefHoriTextDir = 
Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R;
-mpOutliner-SetDefaultHorizontalTextDirection( aDefHoriTextDir );
-
 //create Scrollbars
 mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);
 mpVScrollbar-EnableNativeWidget(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fix fdo#62050: for impress

2013-03-23 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2922

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/22/2922/1

fix fdo#62050: for impress

Impress is also affected by fdo#62050.
In RTL UI, comment window is RTL and editbox’s (editeng) default
writing direction is LTR.
I suspect, bug is result of this RTL  LTR mix-up.

Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf
---
M sd/source/ui/annotations/annotationwindow.cxx
1 file changed, 1 insertion(+), 4 deletions(-)



diff --git a/sd/source/ui/annotations/annotationwindow.cxx 
b/sd/source/ui/annotations/annotationwindow.cxx
index 2a859f0..d03548a 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -327,14 +327,11 @@
 mpOutliner-SetRefDevice( pDev );
 }
 
+mpTextWindow-EnableRTL( sal_False );
 mpOutlinerView = new OutlinerView ( mpOutliner, mpTextWindow );
 mpOutliner-InsertView(mpOutlinerView );
 mpTextWindow-SetOutlinerView(mpOutlinerView);
 mpOutlinerView-SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) );
-
-// TODO: ??
-EEHorizontalTextDirection aDefHoriTextDir = 
Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R;
-mpOutliner-SetDefaultHorizontalTextDirection( aDefHoriTextDir );
 
 //create Scrollbars
 mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);

-- 
To view, visit https://gerrit.libreoffice.org/2922
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] In writer’s RTL UI show author name and date at right side o...

2013-03-23 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2923

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/23/2923/1

In writer’s RTL UI show author name and date at right side of comment window

Change-Id: Ie15482e9953d14927b4f918c43537100a8332689
---
M sw/source/ui/docvw/SidebarWin.cxx
1 file changed, 2 insertions(+), 0 deletions(-)



diff --git a/sw/source/ui/docvw/SidebarWin.cxx 
b/sw/source/ui/docvw/SidebarWin.cxx
index b32fbe4..eb256d4 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -279,6 +279,7 @@
 // window controls for author and date
 mpMetadataAuthor = new Edit( this, 0 );
 mpMetadataAuthor-SetAccessibleName( SW_RES( 
STR_ACCESS_ANNOTATION_AUTHOR_NAME ) );
+mpMetadataAuthor-EnableRTL(Application::GetSettings().GetLayoutRTL());
 mpMetadataAuthor-SetReadOnly();
 mpMetadataAuthor-AlwaysDisableInput(true);
 mpMetadataAuthor-SetCallHandlersOnInputDisabled(true);
@@ -297,6 +298,7 @@
 
 mpMetadataDate = new Edit( this, 0 );
 mpMetadataDate-SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_DATE_NAME 
) );
+mpMetadataDate-EnableRTL(Application::GetSettings().GetLayoutRTL());
 mpMetadataDate-SetReadOnly();
 mpMetadataDate-AlwaysDisableInput(true);
 mpMetadataDate-SetCallHandlersOnInputDisabled(true);

-- 
To view, visit https://gerrit.libreoffice.org/2923
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie15482e9953d14927b4f918c43537100a8332689
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-03-23 Thread navin patidar
 sd/source/ui/annotations/annotationwindow.cxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 092bf2fb0052ca73855127dc03ff1ae3f9321506
Author: navin patidar pati...@kacst.edu.sa
Date:   Tue Mar 19 15:21:21 2013 +0300

fix fdo#62050: for impress

Impress is also affected by fdo#62050.
In RTL UI, comment window is RTL and editbox’s (editeng) default
writing direction is LTR.
I suspect, bug is result of this RTL  LTR mix-up.

Change-Id: I188ce05350f721081378509915158d4ec4e5f8cf
Reviewed-on: https://gerrit.libreoffice.org/2922
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa

diff --git a/sd/source/ui/annotations/annotationwindow.cxx 
b/sd/source/ui/annotations/annotationwindow.cxx
index 2a859f0..d03548a 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -327,15 +327,12 @@ void AnnotationWindow::InitControls()
 mpOutliner-SetRefDevice( pDev );
 }
 
+mpTextWindow-EnableRTL( sal_False );
 mpOutlinerView = new OutlinerView ( mpOutliner, mpTextWindow );
 mpOutliner-InsertView(mpOutlinerView );
 mpTextWindow-SetOutlinerView(mpOutlinerView);
 mpOutlinerView-SetOutputArea( PixelToLogic( Rectangle(0,0,1,1) ) );
 
-// TODO: ??
-EEHorizontalTextDirection aDefHoriTextDir = 
Application::GetSettings().GetLayoutRTL() ? EE_HTEXTDIR_R2L : EE_HTEXTDIR_L2R;
-mpOutliner-SetDefaultHorizontalTextDirection( aDefHoriTextDir );
-
 //create Scrollbars
 mpVScrollbar = new ScrollBar(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);
 mpVScrollbar-EnableNativeWidget(false);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-03-23 Thread navin patidar
 sw/source/ui/docvw/SidebarWin.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit a56a162e66269bfe39ba76bacc51efe4cff314da
Author: navin patidar pati...@kacst.edu.sa
Date:   Sat Mar 23 09:49:46 2013 +0300

In writer’s RTL UI show author name and date at right side of comment 
window

Change-Id: Ie15482e9953d14927b4f918c43537100a8332689
Reviewed-on: https://gerrit.libreoffice.org/2923
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa

diff --git a/sw/source/ui/docvw/SidebarWin.cxx 
b/sw/source/ui/docvw/SidebarWin.cxx
index a848fb6..45f367d 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -278,6 +278,7 @@ void SwSidebarWin::InitControls()
 // window controls for author and date
 mpMetadataAuthor = new Edit( this, 0 );
 mpMetadataAuthor-SetAccessibleName( SW_RES( 
STR_ACCESS_ANNOTATION_AUTHOR_NAME ) );
+mpMetadataAuthor-EnableRTL(Application::GetSettings().GetLayoutRTL());
 mpMetadataAuthor-SetReadOnly();
 mpMetadataAuthor-AlwaysDisableInput(true);
 mpMetadataAuthor-SetCallHandlersOnInputDisabled(true);
@@ -296,6 +297,7 @@ void SwSidebarWin::InitControls()
 
 mpMetadataDate = new Edit( this, 0 );
 mpMetadataDate-SetAccessibleName( SW_RES( STR_ACCESS_ANNOTATION_DATE_NAME 
) );
+mpMetadataDate-EnableRTL(Application::GetSettings().GetLayoutRTL());
 mpMetadataDate-SetReadOnly();
 mpMetadataDate-AlwaysDisableInput(true);
 mpMetadataDate-SetCallHandlersOnInputDisabled(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - 4 commits - editeng/inc editeng/source sd/source svx/source

2013-03-14 Thread navin patidar
 editeng/inc/editeng/outliner.hxx |2 -
 editeng/source/outliner/outliner.cxx |   38 ++-
 sd/source/core/sdpage.cxx|2 -
 svx/source/table/tablelayouter.cxx   |2 -
 4 files changed, 6 insertions(+), 38 deletions(-)

New commits:
commit b6b0e5527cce681fe157b2f091b67a7ae8cf9aa2
Author: navin patidar pati...@kacst.edu.sa
Date:   Mon Mar 11 09:06:45 2013 +0300

fix fdo#62143: set TEXT_LAYOUT_BIDI_STRONG flag.

Change-Id: I19ed1874ff73c3a8002934fa3456d718e383c5d6
Reviewed-on: https://gerrit.libreoffice.org/2664
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org
(cherry picked from commit 68c3dfc3119a50ee9c9c6d65f4c656637152bbad)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 9688e89..6ddec87 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -984,7 +984,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point 
rStartPos,
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
 nLayoutMode = 
~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG);
 if ( bRightToLeftPara )
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT;
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT | TEXT_LAYOUT_BIDI_STRONG;
 pOutDev-SetLayoutMode( nLayoutMode );
 
 if(bStrippingPortions)
commit 4c13903e61017b3d7869882aac1ec272a2c4474c
Author: K_Karthikeyan karthike...@kacst.edu.sa
Date:   Mon Feb 25 11:01:46 2013 +0300

Resolves fdo#60554

Resolves fdo#60554 borders disappear while merging cells

Change-Id: I3d3464e8b75cc9b72a1592d8ef276243202e68b8
Reviewed-on: https://gerrit.libreoffice.org/2375
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
(cherry picked from commit 45a5dad0460a1a7d1a44716968b8c9ff4a23e04b)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/svx/source/table/tablelayouter.cxx 
b/svx/source/table/tablelayouter.cxx
index 15d85e9..b581d8f 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -1024,7 +1024,7 @@ void TableLayouter::UpdateBorderLayout()
 for( aPos.mnCol = 0; aPos.mnCol  nColCount; aPos.mnCol++ )
 {
 CellRef xCell( getCell( aPos ) );
-if( !xCell.is() || xCell-isMerged() )
+if( !xCell.is() )
 continue;
 
 const SvxBoxItem* pThisAttr = (const 
SvxBoxItem*)xCell-GetItemSet().GetItem( SDRATTR_TABLE_BORDER );
commit cbfcc02027b64f71b2d888e438a2e964d9da0f50
Author: Faisal M. Al-Otaibi fmalota...@kacst.edu.sa
Date:   Sun Feb 24 14:26:17 2013 +0300

Fix fdo#60855 RTL UI: handout show boxes out of page border

Change-Id: Ie0103d7c2911dcf184d39b5c394cffae4dbe122f
Reviewed-on: https://gerrit.libreoffice.org/2356
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
(cherry picked from commit 12de9b3361236e1d6c931409cf0ad0d4f9924008)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 7e1bf02..ecc38f4 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2989,7 +2989,7 @@ void SdPage::CalculateHandoutAreas( SdDrawDocument 
rModel, AutoLayout eLayout,
 
 const long nOffsetX = (aPartArea.Width() + nGapW) * (bRTL ? -1 : 1);
 const long nOffsetY = aPartArea.Height() + nGapH;
-const long nStartX = bRTL ? nOffsetX*(1 - nColCnt) - nX : nX;
+const long nStartX = bRTL ? nOffsetX*(1 - nColCnt) + nX : nX;
 
 for(sal_uInt16 nRow = 0; nRow  nRowCnt; nRow++)
 {
commit c1ab08f2559d3996ba595cfbdad287e5a7038f81
Author: navin pati...@kacst.edu.sa
Date:   Sat Feb 23 17:58:11 2013 +0300

fix fdo#38951, use paragraph’s writing direction.

In case of RTL, we want bullet text e.g. “1. ,1)” to be reversed
e.g. “.1,(1”, so we need to check only paragraph’s writing direction
and pass that direction to DrawingText().
and fix drawing position calculation logic.

Change-Id: I303dc1b04ae5e66b1b5d25a40794be308f36668b
Reviewed-on: https://gerrit.libreoffice.org/2348
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
(cherry picked from commit 2738fa9fdc3aec9a64f2eab1d9d48942218c199e)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx
index fcc90bb..61e6a41 100644
--- a/editeng/inc/editeng/outliner.hxx
+++ b/editeng/inc/editeng/outliner.hxx
@@ -389,7 +389,7

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - editeng/source

2013-03-14 Thread navin patidar
 editeng/source/editeng/impedit3.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 065c8507bc6393468c0186370b1b991e22008b27
Author: navin patidar pati...@kacst.edu.sa
Date:   Sat Feb 2 08:40:30 2013 +0300

fix fdo#59892 completely and fdo#33302 partially.

fix fdo#33302 for rtl scripts in cal,impress and draw.

Reviewed-on: https://gerrit.libreoffice.org/1961
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
(cherry picked from commit 73de30ca9ca0d3d4edd00e0e8f22451238699989)

fix logic to get L/R direction

Reviewed-on: https://gerrit.libreoffice.org/1972
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com
(cherry picked from commit fb697ed0ab6e0182b45c78412563c51d6f22f9d5)

Change-Id: I21449d8ee236d798481fc61fbb1b4d12623cac90
Signed-off-by: Lior Kaplan kaplanl...@gmail.com
Reviewed-on: https://gerrit.libreoffice.org/2728
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index b45c826..bada916 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4300,7 +4300,7 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice* 
pOutDev, String* pString, x
 void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 
nPara, sal_uInt16 nIndex )
 {
 sal_Bool bCTL = sal_False;
-sal_uInt8 bR2L = sal_False;
+sal_Bool bR2L = sal_False;
 if ( nIndex == 0x )
 {
 bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
@@ -4311,8 +4311,9 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* 
pOutDev, sal_uInt16 nPara,
 ContentNode* pNode = GetEditDoc().GetObject( nPara );
 short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
 bCTL = nScriptType == i18n::ScriptType::COMPLEX;
-bR2L = GetRightToLeft( nPara, nIndex + 1);  // this change was 
discussed in issue 37190
-// it also works for issue 
55927
+// this change was discussed in issue 37190
+bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
+// it also works for issue 55927
 }
 
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - drawinglayer/source editeng/source

2013-03-14 Thread navin patidar
 drawinglayer/source/processor2d/vclprocessor2d.cxx |4 ++--
 editeng/source/editeng/impedit3.cxx|   18 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

New commits:
commit fc7a1b54cf8edbc52fb48e89043d3b9f9a742a4b
Author: navin patidar pati...@kacst.edu.sa
Date:   Sun Feb 10 09:40:50 2013 +0300

fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.

Stop ImplLayoutArgs::ImplLayoutArgs() to perform
ubidi algo on text by setting TEXT_LAYOUT_BIDI_STRONG flag.

Change-Id: I7222517c1db6649eef0c0d9c11cbbbed1fc6bb04
Reviewed-on: https://gerrit.libreoffice.org/2076
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa
(cherry picked from commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3)

Signed-off-by: Lior Kaplan kaplanl...@gmail.com

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index aeb83c2..adde6aa 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -268,8 +268,8 @@ namespace drawinglayer
 
 if(rTextCandidate.getFontAttribute().getRTL())
 {
-sal_uInt32 nRTLLayoutMode(nOldLayoutMode  
~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG));
-nRTLLayoutMode |= 
TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
+sal_uInt32 nRTLLayoutMode(nOldLayoutMode  
~(TEXT_LAYOUT_COMPLEX_DISABLED));
+nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT;
 mpOutputDevice-SetLayoutMode(nRTLLayoutMode);
 }
 
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index bada916..bcd3695 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4299,18 +4299,13 @@ void ImpEditEngine::ImplInitDigitMode( OutputDevice* 
pOutDev, String* pString, x
 
 void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 
nPara, sal_uInt16 nIndex )
 {
-sal_Bool bCTL = sal_False;
 sal_Bool bR2L = sal_False;
 if ( nIndex == 0x )
 {
-bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
 bR2L = IsRightToLeft( nPara );
 }
 else
 {
-ContentNode* pNode = GetEditDoc().GetObject( nPara );
-short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
-bCTL = nScriptType == i18n::ScriptType::COMPLEX;
 // this change was discussed in issue 37190
 bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
 // it also works for issue 55927
@@ -4319,21 +4314,18 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* 
pOutDev, sal_uInt16 nPara,
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
 
 // We always use the left postion for DrawText()
-nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL);
+// Let VCL do CTL checking
+nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED);
 
-if ( !bCTL  !bR2L)
+if ( !bR2L )
 {
 // No CTL/Bidi checking neccessary
 nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED | 
TEXT_LAYOUT_BIDI_STRONG );
 }
 else
 {
-// CTL/Bidi checking neccessary
-// Don't use BIDI_STRONG, VCL must do some checks.
-nLayoutMode = ~( TEXT_LAYOUT_COMPLEX_DISABLED | 
TEXT_LAYOUT_BIDI_STRONG );
-
-if ( bR2L )
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
+//Use BIDI_STRONG, Stop VCL to perform ubidi algo on text.
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT | 
TEXT_LAYOUT_BIDI_STRONG;
 }
 
 pOutDev-SetLayoutMode( nLayoutMode );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fix fdo#62143: set TEXT_LAYOUT_BIDI_STRONG flag.

2013-03-11 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2664

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/64/2664/1

fix fdo#62143: set TEXT_LAYOUT_BIDI_STRONG flag.

Change-Id: I19ed1874ff73c3a8002934fa3456d718e383c5d6
---
M editeng/source/outliner/outliner.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index adf0d08..dbb62b9 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -980,7 +980,7 @@
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
 nLayoutMode = 
~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG);
 if ( bRightToLeftPara )
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT;
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT | TEXT_LAYOUT_BIDI_STRONG;
 pOutDev-SetLayoutMode( nLayoutMode );
 
 if(bStrippingPortions)

-- 
To view, visit https://gerrit.libreoffice.org/2664
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19ed1874ff73c3a8002934fa3456d718e383c5d6
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-03-11 Thread navin patidar
 editeng/source/outliner/outliner.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68c3dfc3119a50ee9c9c6d65f4c656637152bbad
Author: navin patidar pati...@kacst.edu.sa
Date:   Mon Mar 11 09:06:45 2013 +0300

fix fdo#62143: set TEXT_LAYOUT_BIDI_STRONG flag.

Change-Id: I19ed1874ff73c3a8002934fa3456d718e383c5d6
Reviewed-on: https://gerrit.libreoffice.org/2664
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index 259e5d4..3976d1b 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -980,7 +980,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point 
rStartPos,
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
 nLayoutMode = 
~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG);
 if ( bRightToLeftPara )
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT;
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_TEXTORIGIN_LEFT | TEXT_LAYOUT_BIDI_STRONG;
 pOutDev-SetLayoutMode( nLayoutMode );
 
 if(bStrippingPortions)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


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

2013-03-04 Thread navin patidar
 sd/source/ui/view/drtxtob1.cxx |   13 -
 1 file changed, 12 insertions(+), 1 deletion(-)

New commits:
commit 5b32d9c4406a68507ac9737ee0ada8bd1d424815
Author: navin patidar pati...@kacst.edu.sa
Date:   Wed Feb 27 08:25:45 2013 +0300

fix fdo#61492: update sd:View with FONTHEIGHT attribute changes.

update sd:View with FONTHEIGHT attribute changes, so that
it can position bullet and text properly.

Change-Id: Ibf8c6423e64d194c2711d9c37b58de31f1c4c2dd

diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 7d92552..4163ff1 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -312,7 +312,18 @@ void TextObjectBar::Execute( SfxRequest rReq )
 if( pFontList )
 {
 FuText::ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pOLV, 
pFontList, mpView );
-mpViewShell-GetViewFrame()-GetBindings().Invalidate( 
SID_ATTR_CHAR_FONTHEIGHT );
+
+SfxItemSet aSet( pOLV-GetEditView().GetAttribs() );
+SfxItemSet aNewAttrs (pOLV-GetEditView().GetEmptyItemSet() );
+
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ), 
EE_CHAR_FONTHEIGHT );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ), 
EE_CHAR_FONTHEIGHT_CJK );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ), 
EE_CHAR_FONTHEIGHT_CTL );
+
+mpView-SetAttributes( aNewAttrs );
+Invalidate();
+// to refresh preview (in outline mode), slot has to be 
invalidated:
+mpViewShell-GetViewFrame()-GetBindings().Invalidate( 
SID_PREVIEW_STATE, sal_True, sal_False );
 }
 rReq.Done();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fix fdo#61492: update sd:View with FONTHEIGHT attribute chan...

2013-02-26 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2433

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/33/2433/1

fix fdo#61492: update sd:View with FONTHEIGHT attribute changes.

update sd:View with FONTHEIGHT attribute changes, so that
it can position bullet and text properly.

Change-Id: Ibf8c6423e64d194c2711d9c37b58de31f1c4c2dd
---
M sd/source/ui/view/drtxtob1.cxx
1 file changed, 10 insertions(+), 1 deletion(-)



diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 46bb8e3..8a5d0e5 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -312,7 +312,16 @@
 if( pFontList )
 {
 FuText::ChangeFontSize( nSlot == SID_GROW_FONT_SIZE, pOLV, 
pFontList, mpView );
-mpViewShell-GetViewFrame()-GetBindings().Invalidate( 
SID_ATTR_CHAR_FONTHEIGHT );
+
+SfxItemSet aSet( pOLV-GetEditView().GetAttribs() );
+SfxItemSet aNewAttrs (pOLV-GetEditView().GetEmptyItemSet() );
+
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT ), 
EE_CHAR_FONTHEIGHT );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CJK ), 
EE_CHAR_FONTHEIGHT_CJK );
+aNewAttrs.Put( aSet.Get( EE_CHAR_FONTHEIGHT_CTL ), 
EE_CHAR_FONTHEIGHT_CTL );
+
+mpView-SetAttributes( aNewAttrs );
+Invalidate();
 }
 rReq.Done();
 }

-- 
To view, visit https://gerrit.libreoffice.org/2433
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf8c6423e64d194c2711d9c37b58de31f1c4c2dd
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] core.git: 2 commits - configure.ac drawinglayer/source editeng/source

2013-02-25 Thread navin patidar
 configure.ac   |5 -
 drawinglayer/source/processor2d/vclprocessor2d.cxx |4 ++--
 editeng/source/editeng/impedit3.cxx|   18 +-
 3 files changed, 11 insertions(+), 16 deletions(-)

New commits:
commit 6708ad7f1baa8d4cef1718bdef1d26fb5d8510f3
Author: navin patidar pati...@kacst.edu.sa
Date:   Sun Feb 10 09:40:50 2013 +0300

fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.

Stop ImplLayoutArgs::ImplLayoutArgs() to perform
ubidi algo on text by setting TEXT_LAYOUT_BIDI_STRONG flag.

Change-Id: I7222517c1db6649eef0c0d9c11cbbbed1fc6bb04
Reviewed-on: https://gerrit.libreoffice.org/2076
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa

diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index aeb83c2..adde6aa 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -268,8 +268,8 @@ namespace drawinglayer
 
 if(rTextCandidate.getFontAttribute().getRTL())
 {
-sal_uInt32 nRTLLayoutMode(nOldLayoutMode  
~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG));
-nRTLLayoutMode |= 
TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
+sal_uInt32 nRTLLayoutMode(nOldLayoutMode  
~(TEXT_LAYOUT_COMPLEX_DISABLED));
+nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT;
 mpOutputDevice-SetLayoutMode(nRTLLayoutMode);
 }
 
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 9860c84..f6f091b 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4274,18 +4274,13 @@ void ImpEditEngine::ImplInitDigitMode(OutputDevice* 
pOutDev, LanguageType eCurLa
 
 void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 
nPara, sal_uInt16 nIndex )
 {
-sal_Bool bCTL = sal_False;
 sal_Bool bR2L = sal_False;
 if ( nIndex == 0x )
 {
-bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
 bR2L = IsRightToLeft( nPara );
 }
 else
 {
-ContentNode* pNode = GetEditDoc().GetObject( nPara );
-short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
-bCTL = nScriptType == i18n::ScriptType::COMPLEX;
 // this change was discussed in issue 37190
 bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
 // it also works for issue 55927
@@ -4294,21 +4289,18 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* 
pOutDev, sal_uInt16 nPara,
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
 
 // We always use the left postion for DrawText()
-nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL);
+// Let VCL do CTL checking
+nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED);
 
-if ( !bCTL  !bR2L)
+if ( !bR2L )
 {
 // No CTL/Bidi checking neccessary
 nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED | 
TEXT_LAYOUT_BIDI_STRONG );
 }
 else
 {
-// CTL/Bidi checking neccessary
-// Don't use BIDI_STRONG, VCL must do some checks.
-nLayoutMode = ~( TEXT_LAYOUT_COMPLEX_DISABLED | 
TEXT_LAYOUT_BIDI_STRONG );
-
-if ( bR2L )
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
+//Use BIDI_STRONG, Stop VCL to perform ubidi algo on text.
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT | 
TEXT_LAYOUT_BIDI_STRONG;
 }
 
 pOutDev-SetLayoutMode( nLayoutMode );
commit 69800aa08845955a1a8cedd126e27ac1ec352792
Author: Tor Lillqvist t...@iki.fi
Date:   Mon Feb 25 10:18:03 2013 +0200

I am not so sure the --with-system-FOO-for-build options are superseded?

Change-Id: If1990e43938c5653cd7444cbaaf8ade1ab4f7d1e

diff --git a/configure.ac b/configure.ac
index 0ea3acf..3d4166d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2011,7 +2011,10 @@ AC_ARG_WITH(macosx-version-max-allowed,
 
 dnl ===
 dnl options for stuff used during cross-compilation build
-dnl These are superseded by --with-build-platform-configure-options
+dnl These are superseded by --with-build-platform-configure-options.
+dnl Or are they? Look for the complicated tests for $cross_compiling = yes 
-a \(
+dnl $with_system_icu_for_build = yes -o $with_system_icu_for_build = 
force \)
+dnl far below. Could whoever understands MinGW cross-compilation clean up this 
please.
 dnl ===
 
 AC_ARG_WITH(system-boost-for-build,
___
Libreoffice-commits mailing list
libreoffice

[PATCH] fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.

2013-02-11 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/2076

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/76/2076/1

fix fdo#60533, Set TEXT_LAYOUT_BIDI_STRONG flag.

Stop ImplLayoutArgs::ImplLayoutArgs() to perform
ubidi algo on text by setting TEXT_LAYOUT_BIDI_STRONG flag.

Change-Id: I7222517c1db6649eef0c0d9c11cbbbed1fc6bb04
---
M drawinglayer/source/processor2d/vclprocessor2d.cxx
M editeng/source/editeng/impedit3.cxx
2 files changed, 7 insertions(+), 15 deletions(-)



diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index aeb83c2..adde6aa 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -268,8 +268,8 @@
 
 if(rTextCandidate.getFontAttribute().getRTL())
 {
-sal_uInt32 nRTLLayoutMode(nOldLayoutMode  
~(TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG));
-nRTLLayoutMode |= 
TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
+sal_uInt32 nRTLLayoutMode(nOldLayoutMode  
~(TEXT_LAYOUT_COMPLEX_DISABLED));
+nRTLLayoutMode |= TEXT_LAYOUT_BIDI_RTL | 
TEXT_LAYOUT_BIDI_STRONG | TEXT_LAYOUT_TEXTORIGIN_LEFT;
 mpOutputDevice-SetLayoutMode(nRTLLayoutMode);
 }
 
diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 8108770..4b2155c 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4274,18 +4274,13 @@
 
 void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 
nPara, sal_uInt16 nIndex )
 {
-sal_Bool bCTL = sal_False;
 sal_Bool bR2L = sal_False;
 if ( nIndex == 0x )
 {
-bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
 bR2L = IsRightToLeft( nPara );
 }
 else
 {
-ContentNode* pNode = GetEditDoc().GetObject( nPara );
-short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
-bCTL = nScriptType == i18n::ScriptType::COMPLEX;
 // this change was discussed in issue 37190
 bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
 // it also works for issue 55927
@@ -4294,21 +4289,18 @@
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
 
 // We always use the left postion for DrawText()
-nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL);
+// Let VCL do CTL checking
+nLayoutMode = ~(TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_COMPLEX_DISABLED);
 
-if ( !bCTL  !bR2L)
+if ( !bR2L )
 {
 // No CTL/Bidi checking neccessary
 nLayoutMode |= ( TEXT_LAYOUT_COMPLEX_DISABLED | 
TEXT_LAYOUT_BIDI_STRONG );
 }
 else
 {
-// CTL/Bidi checking neccessary
-// Don't use BIDI_STRONG, VCL must do some checks.
-nLayoutMode = ~( TEXT_LAYOUT_COMPLEX_DISABLED | 
TEXT_LAYOUT_BIDI_STRONG );
-
-if ( bR2L )
-nLayoutMode |= TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_TEXTORIGIN_LEFT;
+//Use BIDI_STRONG, Stop VCL to perform ubidi algo on text.
+nLayoutMode |= TEXT_LAYOUT_BIDI_RTL | TEXT_LAYOUT_TEXTORIGIN_LEFT | 
TEXT_LAYOUT_BIDI_STRONG;
 }
 
 pOutDev-SetLayoutMode( nLayoutMode );

-- 
To view, visit https://gerrit.libreoffice.org/2076
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7222517c1db6649eef0c0d9c11cbbbed1fc6bb04
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


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

2013-02-06 Thread navin patidar
 editeng/source/editeng/impedit3.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fb697ed0ab6e0182b45c78412563c51d6f22f9d5
Author: navin patidar pati...@kacst.edu.sa
Date:   Sun Feb 3 10:24:54 2013 +0300

fix logic to get L/R direction

Change-Id: I481f9ea57f8c5b71eb849df3f71c75f8b9b0f1fa
Reviewed-on: https://gerrit.libreoffice.org/1972
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 4458937..8108770 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4287,7 +4287,7 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* 
pOutDev, sal_uInt16 nPara,
 short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
 bCTL = nScriptType == i18n::ScriptType::COMPLEX;
 // this change was discussed in issue 37190
-bR2L = GetRightToLeft( nPara, nIndex + 1) == 1 /*RTL*/ ? true : false;
+bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
 // it also works for issue 55927
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


[PATCH] fix logic to get L/R direction

2013-02-03 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1972

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/72/1972/1

fix logic to get L/R direction

Change-Id: I481f9ea57f8c5b71eb849df3f71c75f8b9b0f1fa
---
M editeng/source/editeng/impedit3.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 4458937..8108770 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4287,7 +4287,7 @@
 short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
 bCTL = nScriptType == i18n::ScriptType::COMPLEX;
 // this change was discussed in issue 37190
-bR2L = GetRightToLeft( nPara, nIndex + 1) == 1 /*RTL*/ ? true : false;
+bR2L = GetRightToLeft( nPara, nIndex + 1) % 2 ? sal_True : sal_False;
 // it also works for issue 55927
 }
 

-- 
To view, visit https://gerrit.libreoffice.org/1972
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I481f9ea57f8c5b71eb849df3f71c75f8b9b0f1fa
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] fix fdo#59892 completely and fdo#33302 partially.

2013-02-02 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1961

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/61/1961/1

fix fdo#59892 completely and fdo#33302 partially.

fix fdo#33302 for rtl scripts in cal,impress and draw.

Change-Id: I83b1e077faf0f2578308e03b7598557f60e7cfd8
---
M editeng/source/editeng/impedit3.cxx
1 file changed, 4 insertions(+), 3 deletions(-)



diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 964579c..9aba093 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4288,7 +4288,7 @@
 void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 
nPara, sal_uInt16 nIndex )
 {
 sal_Bool bCTL = sal_False;
-sal_uInt8 bR2L = sal_False;
+sal_Bool bR2L = sal_False;
 if ( nIndex == 0x )
 {
 bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
@@ -4299,8 +4299,9 @@
 ContentNode* pNode = GetEditDoc().GetObject( nPara );
 short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
 bCTL = nScriptType == i18n::ScriptType::COMPLEX;
-bR2L = GetRightToLeft( nPara, nIndex + 1);  // this change was 
discussed in issue 37190
-// it also works for issue 
55927
+// this change was discussed in issue 37190
+bR2L = GetRightToLeft( nPara, nIndex + 1) == 1 /*RTL*/ ? true : false;
+// it also works for issue 55927
 }
 
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();

-- 
To view, visit https://gerrit.libreoffice.org/1961
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83b1e077faf0f2578308e03b7598557f60e7cfd8
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[Libreoffice-commits] .: editeng/source

2013-02-01 Thread navin patidar
 editeng/source/editeng/impedit3.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 73de30ca9ca0d3d4edd00e0e8f22451238699989
Author: navin patidar pati...@kacst.edu.sa
Date:   Sat Feb 2 08:40:30 2013 +0300

fix fdo#59892 completely and fdo#33302 partially.

fix fdo#33302 for rtl scripts in cal,impress and draw.

Change-Id: I83b1e077faf0f2578308e03b7598557f60e7cfd8
Reviewed-on: https://gerrit.libreoffice.org/1961
Reviewed-by: Ahmad Harthi aalhar...@kacst.edu.sa
Tested-by: Ahmad Harthi aalhar...@kacst.edu.sa

diff --git a/editeng/source/editeng/impedit3.cxx 
b/editeng/source/editeng/impedit3.cxx
index 74f6f9e..4458937 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -4275,7 +4275,7 @@ void ImpEditEngine::ImplInitDigitMode(OutputDevice* 
pOutDev, LanguageType eCurLa
 void ImpEditEngine::ImplInitLayoutMode( OutputDevice* pOutDev, sal_uInt16 
nPara, sal_uInt16 nIndex )
 {
 sal_Bool bCTL = sal_False;
-sal_uInt8 bR2L = sal_False;
+sal_Bool bR2L = sal_False;
 if ( nIndex == 0x )
 {
 bCTL = HasScriptType( nPara, i18n::ScriptType::COMPLEX );
@@ -4286,8 +4286,9 @@ void ImpEditEngine::ImplInitLayoutMode( OutputDevice* 
pOutDev, sal_uInt16 nPara,
 ContentNode* pNode = GetEditDoc().GetObject( nPara );
 short nScriptType = GetScriptType( EditPaM( pNode, nIndex+1 ) );
 bCTL = nScriptType == i18n::ScriptType::COMPLEX;
-bR2L = GetRightToLeft( nPara, nIndex + 1);  // this change was 
discussed in issue 37190
-// it also works for issue 
55927
+// this change was discussed in issue 37190
+bR2L = GetRightToLeft( nPara, nIndex + 1) == 1 /*RTL*/ ? true : false;
+// it also works for issue 55927
 }
 
 sal_uLong nLayoutMode = pOutDev-GetLayoutMode();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits


resolves:fdo#54629 vcl:gdi add recursive check

2013-01-25 Thread navin patidar (via Code Review)
navin patidar has abandoned this change.

Change subject: resolves:fdo#54629 vcl:gdi add recursive check
..


Patch Set 3: Abandoned

I agree using MultiSalLayout::GetNextGlyphs is right way to fix this bug . I 
didn't remove MultiSalLayout::GetBoundRect  because i thought removing it might 
break something else.
Thanks for reviewing patch

-- 
To view, visit https://gerrit.libreoffice.org/1662
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I8eebde2196d6551ddcf9d020afa3a157c809710c
Gerrit-PatchSet: 3
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa
Gerrit-Reviewer: Caolán McNamara caol...@redhat.com
Gerrit-Reviewer: abdulmajeed ahmed aalabdulraz...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] resolves:fdo#54629 vcl:gdi add recursive check

2013-01-12 Thread navin patidar (via Code Review)
Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1662

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/1662/1

resolves:fdo#54629 vcl:gdi add recursive check

check all font fallback levels if rRect.IsEmpty() is true for
specific level.

Change-Id: I8eebde2196d6551ddcf9d020afa3a157c809710c
---
M vcl/unx/generic/gdi/salgdi3.cxx
1 file changed, 16 insertions(+), 4 deletions(-)



diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index fb7027e..e0924f8 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -687,14 +687,15 @@
 
 sal_Bool X11SalGraphics::GetGlyphBoundRect( sal_GlyphId nGlyphIndex, 
Rectangle rRect )
 {
+static int i = -1;
 int nLevel = nGlyphIndex  GF_FONTSHIFT;
-if( nLevel = MAX_FALLBACK )
-return sal_False;
 
 ServerFont* pSF = mpServerFont[ nLevel ];
 if( !pSF )
+{
+i = -1;
 return sal_False;
-
+}
 nGlyphIndex = GF_IDXMASK;
 const GlyphMetric rGM = pSF-GetGlyphMetric( nGlyphIndex );
 Rectangle aRect( rGM.GetOffset(), rGM.GetSize() );
@@ -712,7 +713,18 @@
 else
 rRect = aRect;
 
-return sal_True;
+if ( rRect.IsEmpty() )
+{
+i++;
+sal_GlyphId nFontTag = i  GF_FONTSHIFT;
+// Check all fallback font levels, start from level zero
+GetGlyphBoundRect( nGlyphIndex | nFontTag, rRect );
+}
+else
+{
+i = -1;
+return sal_True;
+}
 }
 
 // ---

-- 
To view, visit https://gerrit.libreoffice.org/1662
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8eebde2196d6551ddcf9d020afa3a157c809710c
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


Change public variables of class ImplDevFontAttributes to pr...

2013-01-08 Thread navin patidar (via Code Review)
navin patidar has abandoned this change.

Change subject: Change public variables of class ImplDevFontAttributes to 
private.
..


Patch Set 2: Abandoned

-- 
To view, visit https://gerrit.libreoffice.org/1565
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: abandon
Gerrit-Change-Id: I256a1ca329f715270ba31261b16858341c91fc26
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa
Gerrit-Reviewer: Stephan Bergmann sberg...@redhat.com
Gerrit-Reviewer: Tor Lillqvist t...@iki.fi

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


RE: [PATCH] Change public variables of class ImplFontAttributes to priva...

2013-01-07 Thread Mr Navin Patidar
I hereby declare that:

All my contributions, past and future, to LibreOffice are licensed
under the terms of the MPL / LGPLv3+.

thanks,
--navin-patidar

From: libreoffice-bounces+patidar=kacst.edu...@lists.freedesktop.org 
[libreoffice-bounces+patidar=kacst.edu...@lists.freedesktop.org] on behalf of 
navin patidar (via Code Review) [ger...@gerrit.libreoffice.org]
Sent: Saturday, January 05, 2013 10:38 PM
To: Norbert Thiebaud
Cc: LibreOffice Developer List
Subject: [PATCH] Change public variables of class ImplFontAttributes to priva...

Hi,

I have submitted a patch for review:

https://gerrit.libreoffice.org/1551

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/51/1551/1

Change public variables of class ImplFontAttributes to private.

Change-Id: I56ff5d7d2420c334c6fc9e4c552f8b5c4715d93f
---
M vcl/generic/fontmanager/fontconfig.cxx
M vcl/generic/fontmanager/fontsubst.cxx
M vcl/generic/glyphs/gcach_ftyp.cxx
M vcl/generic/glyphs/glyphcache.cxx
M vcl/generic/print/genpspgraphics.cxx
M vcl/inc/outfont.hxx
M vcl/source/gdi/font.cxx
M vcl/source/gdi/outdev3.cxx
M vcl/source/gdi/pdfwriter_impl.cxx
9 files changed, 163 insertions(+), 148 deletions(-)



diff --git a/vcl/generic/fontmanager/fontconfig.cxx 
b/vcl/generic/fontmanager/fontconfig.cxx
index b707b78..0efdbe4 100644
--- a/vcl/generic/fontmanager/fontconfig.cxx
+++ b/vcl/generic/fontmanager/fontconfig.cxx
@@ -946,8 +946,8 @@
FcCharSetDestroy(unicodes);
 }

-addtopattern(pPattern, rPattern.meItalic, rPattern.meWeight,
-rPattern.meWidthType, rPattern.mePitch);
+addtopattern(pPattern, rPattern.GetSlant(), rPattern.GetWeight(),
+rPattern.GetWidthType(), rPattern.GetPitch());

 // query fontconfig for a substitute
 FcConfigSubstitute(FcConfigGetCurrent(), pPattern, FcMatchPattern);
@@ -1017,13 +1017,13 @@
 {
 int val = 0;
 if (FcResultMatch == FcPatternGetInteger(pSet-fonts[0], 
FC_WEIGHT, 0, val))
-rPattern.meWeight = convertWeight(val);
+rPattern.SetWeight( convertWeight(val) );
 if (FcResultMatch == FcPatternGetInteger(pSet-fonts[0], 
FC_SLANT, 0, val))
-rPattern.meItalic = convertSlant(val);
+rPattern.SetItalic( convertSlant(val) );
 if (FcResultMatch == FcPatternGetInteger(pSet-fonts[0], 
FC_SPACING, 0, val))
-rPattern.mePitch = convertSpacing(val);
+rPattern.SetPitch ( convertSpacing(val) );
 if (FcResultMatch == FcPatternGetInteger(pSet-fonts[0], 
FC_WIDTH, 0, val))
-rPattern.meWidthType = convertWidth(val);
+rPattern.SetWidthType ( convertWidth(val) );
 FcBool bEmbolden;
 if (FcResultMatch == FcPatternGetBool(pSet-fonts[0], 
FC_EMBOLDEN, 0, bEmbolden))
 rPattern.mbEmbolden = bEmbolden;
diff --git a/vcl/generic/fontmanager/fontsubst.cxx 
b/vcl/generic/fontmanager/fontsubst.cxx
index 23ac968..a026ee9 100644
--- a/vcl/generic/fontmanager/fontsubst.cxx
+++ b/vcl/generic/fontmanager/fontsubst.cxx
@@ -132,10 +132,10 @@
 return
   (
 rOrig.maTargetName == rNew.maSearchName 
-rOrig.meWeight == rNew.meWeight 
-rOrig.meItalic == rNew.meItalic 
-rOrig.mePitch == rNew.mePitch 
-rOrig.meWidthType == rNew.meWidthType
+rOrig.GetWeight() == rNew.GetWeight() 
+rOrig.GetSlant() == rNew.GetSlant() 
+rOrig.GetPitch() == rNew.GetPitch() 
+rOrig.GetWidthType() == rNew.GetWidthType()
   );
 }

diff --git a/vcl/generic/glyphs/gcach_ftyp.cxx 
b/vcl/generic/glyphs/gcach_ftyp.cxx
index d7e693b..de44e31 100644
--- a/vcl/generic/glyphs/gcach_ftyp.cxx
+++ b/vcl/generic/glyphs/gcach_ftyp.cxx
@@ -788,8 +788,8 @@
 mnLoadFlags |= FT_LOAD_IGNORE_TRANSFORM;
 #endif

-mbArtItalic = (rFSD.meItalic != ITALIC_NONE  
pFI-GetFontAttributes().GetSlant() == ITALIC_NONE);
-mbArtBold = (rFSD.meWeight  WEIGHT_MEDIUM  
pFI-GetFontAttributes().GetWeight() = WEIGHT_MEDIUM);
+mbArtItalic = (rFSD.GetSlant() != ITALIC_NONE  
pFI-GetFontAttributes().GetSlant() == ITALIC_NONE);
+mbArtBold = (rFSD.GetWeight()  WEIGHT_MEDIUM  
pFI-GetFontAttributes().GetWeight() = WEIGHT_MEDIUM);
 mbUseGamma = false;
 if( mbArtBold )
 {
@@ -934,7 +934,7 @@
  (rTo.GetFamilyName().EqualsAscii(StarSymbol))
)
 {
-rTo.mbSymbolFlag = true;
+rTo.SetSymbolFlag( true );
 }

 if( maSizeFT )
@@ -964,11 +964,11 @@
 // map the panose info from the OS2 table to their VCL counterparts
 switch( pOS2-panose[0] )
 {
-case 1: rTo.meFamily = FAMILY_ROMAN; break;
-case 2: rTo.meFamily = FAMILY_SWISS; break;
-case 3: rTo.meFamily = FAMILY_MODERN

[PATCH] Change public variables of class ImplDevFontAttributes to pr...

2013-01-07 Thread navin patidar (via Code Review)
() )
 {
 FontSubset rSubset = m_aSubsets[ pCurrentFont ];
 // search for font specific glyphID
diff --git a/vcl/unx/generic/gdi/salgdi3.cxx b/vcl/unx/generic/gdi/salgdi3.cxx
index fb7027e..1964f2d 100644
--- a/vcl/unx/generic/gdi/salgdi3.cxx
+++ b/vcl/unx/generic/gdi/salgdi3.cxx
@@ -552,7 +552,7 @@
 
 // inform glyph cache of new font
 ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes( 
aInfo );
-aDFA.mnQuality += 5800;
+aDFA.SetQuality( aDFA.GetQuality() + 5800 );
 
 int nFaceNum = rMgr.getFontFaceNumber( aInfo.m_nID );
 
@@ -602,7 +602,7 @@
 
 // inform GlyphCache about this font provided by the PsPrint subsystem
 ImplDevFontAttributes aDFA = GenPspGraphics::Info2DevFontAttributes( 
aInfo );
-aDFA.mnQuality += 4096;
+aDFA.SetQuality( aDFA.GetQuality() + 4096 );
 const rtl::OString rFileName = rMgr.getFontFileSysPath( aInfo.m_nID );
 rGC.AddFontFile( rFileName, nFaceNum, aInfo.m_nID, aDFA, 
pExtraKernInfo );
}

-- 
To view, visit https://gerrit.libreoffice.org/1565
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I256a1ca329f715270ba31261b16858341c91fc26
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


License Statement

2013-01-06 Thread Mr Navin Patidar
I hereby declare that:

All my contributions, past and future, to LibreOffice are licensed
under the terms of the MPL / LGPLv3+.

thanks,
--navin-patidar
Warning: This message and its attachment, if any, are confidential and may 
contain information protected by law. If you are not the intended recipient, 
please contact the sender immediately and delete the message and its 
attachment, if any. You should not copy the message and its attachment, if any, 
or disclose its contents to any other person or use it for any purpose. 
Statements and opinions expressed in this e-mail and its attachment, if any, 
are those of the sender, and do not necessarily reflect those of King Abdulaziz 
city for Science and Technology (KACST) in the Kingdom of Saudi Arabia. KACST 
accepts no liability for any damage caused by this email.

تحذير: هذه الرسالة وما تحويه من مرفقات (إن وجدت) تمثل وثيقة سرية قد تحتوي على 
معلومات محمية بموجب القانون. إذا لم تكن الشخص المعني بهذه الرسالة فيجب عليك 
تنبيه المُرسل بخطأ وصولها إليك، وحذف الرسالة ومرفقاتها (إن وجدت)، ولا يجوز لك 
نسخ أو توزيع هذه الرسالة أو مرفقاتها (إن وجدت) أو أي جزء منها، أو البوح 
بمحتوياتها للغير أو استعمالها لأي غرض. علماً بأن فحوى هذه الرسالة ومرفقاتها (ان 
وجدت) تعبر عن رأي المُرسل وليس بالضرورة رأي مدينة الملك عبدالعزيز للعلوم 
والتقنية بالمملكة العربية السعودية، ولا تتحمل المدينة أي مسئولية عن الأضرار 
الناتجة عن ما قد يحتويه هذا البريد.

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice


[PATCH] Change public variables of class ImplFontAttributes to priva...

2013-01-05 Thread navin patidar (via Code Review)
( 
rBuiltin.m_pStyleName );
-aDFA.meFamily   = rBuiltin.m_eFamily;
-aDFA.mbSymbolFlag   = (rBuiltin.m_eCharSet != RTL_TEXTENCODING_MS_1252 );
-aDFA.mePitch= rBuiltin.m_ePitch;
-aDFA.meWeight   = rBuiltin.m_eWeight;
-aDFA.meItalic   = rBuiltin.m_eItalic;
-aDFA.meWidthType= rBuiltin.m_eWidthType;
+aDFA.SetFamilyName( rtl::OUString::createFromAscii( rBuiltin.m_pName ) );
+aDFA.SetStyleName( rtl::OUString::createFromAscii( rBuiltin.m_pStyleName ) 
);
+aDFA.SetFamilyType( rBuiltin.m_eFamily );
+aDFA.SetSymbolFlag( rBuiltin.m_eCharSet != RTL_TEXTENCODING_MS_1252 );
+aDFA.SetPitch( rBuiltin.m_ePitch );
+aDFA.SetWeight( rBuiltin.m_eWeight );
+aDFA.SetItalic( rBuiltin.m_eItalic );
+aDFA.SetWidthType( rBuiltin.m_eWidthType );
 
 aDFA.mbOrientation  = true;
 aDFA.mbDevice   = true;
@@ -2349,11 +2349,11 @@
 const BuiltinFont* pBuiltinFont = pFD-GetBuiltinFont();
 
 pMetric-mnOrientation  = 
sal::static_int_castshort(pSelect-mnOrientation);
-pMetric-meFamily   = pBuiltinFont-m_eFamily;
-pMetric-mePitch= pBuiltinFont-m_ePitch;
-pMetric-meWeight   = pBuiltinFont-m_eWeight;
-pMetric-meItalic   = pBuiltinFont-m_eItalic;
-pMetric-mbSymbolFlag   = pFD-IsSymbolFont();
+pMetric-SetFamilyType( pBuiltinFont-m_eFamily );
+pMetric-SetPitch( pBuiltinFont-m_ePitch );
+pMetric-SetWeight( pBuiltinFont-m_eWeight );
+pMetric-SetItalic( pBuiltinFont-m_eItalic );
+pMetric-SetSymbolFlag( pFD-IsSymbolFont() );
 pMetric-mnWidth= pSelect-mnHeight;
 pMetric-mnAscent   = ( pSelect-mnHeight * +pBuiltinFont-m_nAscent + 
500 ) / 1000;
 pMetric-mnDescent  = ( pSelect-mnHeight * -pBuiltinFont-m_nDescent 
+ 500 ) / 1000;
@@ -3158,7 +3158,7 @@
 aInfo.m_nDescent = 200;
 aInfo.m_nCapHeight = 1000;
 aInfo.m_aFontBBox = Rectangle( Point( -200, -200 ), Size( 1700, 1700 ) );
-aInfo.m_aPSName = pFont-maName;
+aInfo.m_aPSName = pFont-GetFamilyName();
 sal_Int32 pWidths[256];
 memset( pWidths, 0, sizeof(pWidths) );
 if( pFont-IsEmbeddable() )
@@ -3231,7 +3231,7 @@
 aLine.append( /BaseFont/ );
 appendName( aInfo.m_aPSName, aLine );
 aLine.append( \n );
-if( !pFont-mbSymbolFlag )
+if( !pFont-IsSymbolFont() )
 aLine.append( /Encoding/WinAnsiEncoding\n );
 aLine.append( /FirstChar 32 /LastChar 255\n
   /Widths[ );
@@ -3728,7 +3728,7 @@
 /Type/Font/Subtype/Type1/BaseFont/ );
 appendName( aInfo.m_aPSName, aLine );
 aLine.append( \n );
-if( !pFont-mbSymbolFlag   pEncoding == 0 )
+if( !pFont-IsSymbolFont()   pEncoding == 0 )
 aLine.append( /Encoding/WinAnsiEncoding\n );
 if( nToUnicodeStream )
 {

-- 
To view, visit https://gerrit.libreoffice.org/1551
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56ff5d7d2420c334c6fc9e4c552f8b5c4715d93f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: navin patidar pati...@kacst.edu.sa

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice