svn commit: r1821262 - in /openoffice/trunk/main: editeng/source/editeng/ svtools/source/edit/ sw/inc/ sw/source/core/crsr/ sw/source/ui/docvw/ vcl/source/control/ vcl/unx/gtk/window/

[hanya]

Author: hanya
Date: Tue Jan 16 16:17:17 2018
New Revision: 1821262

URL: http://svn.apache.org/viewvc?rev=1821262=rev
Log:
#i127662# send better window position to input method for suggestion window

Modified:
openoffice/trunk/main/editeng/source/editeng/impedit2.cxx
openoffice/trunk/main/svtools/source/edit/textview.cxx
openoffice/trunk/main/sw/inc/crsrsh.hxx
openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx
openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx
openoffice/trunk/main/vcl/source/control/edit.cxx
openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx

Modified: openoffice/trunk/main/editeng/source/editeng/impedit2.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/editeng/impedit2.cxx?rev=1821262=1821261=1821262=diff
==
--- openoffice/trunk/main/editeng/source/editeng/impedit2.cxx (original)
+++ openoffice/trunk/main/editeng/source/editeng/impedit2.cxx Tue Jan 16 
16:17:17 2018
@@ -622,7 +622,12 @@ void ImpEditEngine::Command( const Comma
nInputEnd = pLine->GetEnd();
Rectangle aR2 = PaMtoEditCursor( EditPaM( 
aPaM.GetNode(), nInputEnd ), GETCRSR_ENDOFLINE );
Rectangle aRect = 
pView->GetImpEditView()->GetWindowPos( aR1 );
-   pView->GetWindow()->SetCursorRect( , 
aR2.Left()-aR1.Right() );
+   long nWidth = aR2.Left()-aR1.Right();
+   if ( nWidth == 0 ) {
+   Rectangle aR3 = PaMtoEditCursor( 
mpIMEInfos->aPos );
+   nWidth = -(aR1.Left() - aR3.Left());
+   }
+   pView->GetWindow()->SetCursorRect( , nWidth );
}
else
{

Modified: openoffice/trunk/main/svtools/source/edit/textview.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/edit/textview.cxx?rev=1821262=1821261=1821262=diff
==
--- openoffice/trunk/main/svtools/source/edit/textview.cxx (original)
+++ openoffice/trunk/main/svtools/source/edit/textview.cxx Tue Jan 16 16:17:17 
2018
@@ -1048,6 +1048,10 @@ void TextView::Command( const CommandEve

long nWidth = aR2.Left()-aR1.Right();
aR1.Move( -GetStartDocPos().X(), -GetStartDocPos().Y() 
);
+if ( nWidth == 0 ) {
+Rectangle aR3 = mpImpl->mpTextEngine->PaMtoEditCursor( 
mpImpl->mpTextEngine->mpIMEInfos->aPos );
+nWidth = -(aR1.Left() - aR3.Left());
+}
GetWindow()->SetCursorRect( , nWidth );
}
else

Modified: openoffice/trunk/main/sw/inc/crsrsh.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/inc/crsrsh.hxx?rev=1821262=1821261=1821262=diff
==
--- openoffice/trunk/main/sw/inc/crsrsh.hxx (original)
+++ openoffice/trunk/main/sw/inc/crsrsh.hxx Tue Jan 16 16:17:17 2018
@@ -550,6 +550,11 @@ public:
  * liefert das SRectangle, auf dem der Cursor steht.
  */
 const SwRect () const { return aCharRect; }
+
+// Obtains character rectangle at the position.
+sal_Bool GetCharRectAt( SwRect& rOrig, const SwPosition& rPos,
+  SwCrsrMoveState *pCMS = 0 ) const;
+
 /*
  * liefert zurueck, ob der Cursor sich ganz oder teilweise im
  * sichtbaren Bereich befindet.

Modified: openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx?rev=1821262=1821261=1821262=diff
==
--- openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx (original)
+++ openoffice/trunk/main/sw/source/core/crsr/crsrsh.cxx Tue Jan 16 16:17:17 
2018
@@ -1233,6 +1233,14 @@ sal_Bool SwCrsrShell::GoPrevCrsr()
 }
 
 
+sal_Bool SwCrsrShell::GetCharRectAt( SwRect& rOrig, const SwPosition& rPos,
+ SwCrsrMoveState* pCMS ) const
+{
+SwCntntFrm * pFrm = GetCurrFrm();
+return pFrm ? pFrm->GetCharRect( rOrig, rPos, pCMS ) : sal_False;
+}
+
+
 void SwCrsrShell::Paint( const Rectangle )
 {
SET_CURR_SHELL( this );

Modified: openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx?rev=1821262=1821261=1821262=diff
==
--- openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/docvw/edtwin.cxx Tue Jan 16 16:17:17 2018
@@ -5059,8 +5059,40 @@ void SwE

svn commit: r1762054 - /openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx

[hanya]

Author: hanya
Date: Fri Sep 23 12:26:31 2016
New Revision: 1762054

URL: http://svn.apache.org/viewvc?rev=1762054=rev
Log:
#i127071# Fix illegal index on locations of spell cheker dictionary

Modified:
openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx

Modified: 
openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx?rev=1762054=1762053=1762054=diff
==
--- openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
(original)
+++ openoffice/trunk/main/lingucomponent/source/spellcheck/spell/sspellimp.cxx 
Fri Sep 23 12:26:31 2016
@@ -179,14 +179,23 @@ Sequence< Locale > SAL_CALL SpellChecker
 std::list< SvtLinguConfigDictionaryEntry >::const_iterator aDictIt;
 for (aDictIt = aDics.begin();  aDictIt != aDics.end();  ++aDictIt)
 {
-uno::Sequence< rtl::OUString > aLocaleNames( 
aDictIt->aLocaleNames );
 uno::Sequence< rtl::OUString > aLocations( aDictIt->aLocations 
);
-sal_Int32 nLen2 = aLocaleNames.getLength();
-for (k = 0;  k < nLen2;  ++k)
+if ( xAccess.is() && aLocations.getLength() )
 {
-if (xAccess.is() && xAccess->exists(aLocations[k]))
+sal_Bool bAllFileExists = sal_False;
+sal_Int32 nLength = aLocations.getLength();
+for (sal_Int32 i = 0; i < nLength; ++i)
 {
-aLocaleNamesSet.insert( aLocaleNames[k] );
+bAllFileExists |= xAccess->exists( aLocations[i] );
+}
+if ( bAllFileExists )
+{
+uno::Sequence< rtl::OUString > aLocaleNames( 
aDictIt->aLocaleNames );
+sal_Int32 nLen2 = aLocaleNames.getLength();
+for (k = 0;  k < nLen2;  ++k)
+{
+aLocaleNamesSet.insert( aLocaleNames[k] );
+}
 }
 }
 }

svn commit: r1761439 - /openoffice/trunk/main/svtools/inc/svtools/treelist.hxx

[hanya]

Author: hanya
Date: Mon Sep 19 13:29:14 2016
New Revision: 1761439

URL: http://svn.apache.org/viewvc?rev=1761439=rev
Log:
#i125762# fix null pointer reference while accessibility related call

Modified:
openoffice/trunk/main/svtools/inc/svtools/treelist.hxx

Modified: openoffice/trunk/main/svtools/inc/svtools/treelist.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/inc/svtools/treelist.hxx?rev=1761439=1761438=1761439=diff
==
--- openoffice/trunk/main/svtools/inc/svtools/treelist.hxx (original)
+++ openoffice/trunk/main/svtools/inc/svtools/treelist.hxx Mon Sep 19 13:29:14 
2016
@@ -404,7 +404,7 @@ inline sal_Bool SvListView::IsExpanded(
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry );
DBG_ASSERT(pData,"Entry not in Table");
-   return pData->IsExpanded();
+   return pData && pData->IsExpanded();
 }
 inline sal_Bool SvListView::IsSelected( SvListEntry* pEntry ) const
 {

svn commit: r1721674 - /openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx

[hanya]

Author: hanya
Date: Fri Dec 25 13:29:02 2015
New Revision: 1721674

URL: http://svn.apache.org/viewvc?rev=1721674=rev
Log:
#i126753# fix invalid parse of GSUB table for OpenType fonts

Modified:
openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx

Modified: openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx?rev=1721674=1721673=1721674=diff
==
--- openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx (original)
+++ openoffice/trunk/main/vcl/source/glyphs/gcach_ftyp.cxx Fri Dec 25 13:29:02 
2015
@@ -721,8 +721,8 @@ FreetypeServerFont::FreetypeServerFont(
 maFaceFT = pFI->GetFaceFT();
 
 #ifdef HDU_DEBUG
-fprintf( stderr, "FTSF::FTSF(\"%s\", h=%d, w=%d, sy=%d) => %d\n",
-pFI->GetFontFileName()->getStr(), rFSD.mnHeight, rFSD.mnWidth, 
pFI->IsSymbolFont(), maFaceFT!=0 );
+fprintf( stderr, "FTSF::FTSF(\"%s\", h=%d, w=%d, vt=%d, sy=%d) => %d\n",
+pFI->GetFontFileName()->getStr(), rFSD.mnHeight, rFSD.mnWidth, 
rFSD.mbVertical, pFI->IsSymbolFont(), maFaceFT!=0 );
 #endif
 
 if( !maFaceFT )
@@ -2469,6 +2469,7 @@ bool FreetypeServerFont::ApplyGSUB( cons
 }
 
 const FT_Byte* pFeatureTable = pGsubBase + nOfsFeatureTable + nOffset;
+pFeatureTable += 2; // ignore FeatureParams
 const sal_uInt16 nCntLookups = GetUShort( pFeatureTable+0 );
 pFeatureTable += 2;
 for( sal_uInt16 i = 0; i < nCntLookups; ++i )

svn commit: r1714989 - in /openoffice/trunk/main/offapi/com/sun/star/awt: UnoControlButtonModel.idl XButton.idl

[hanya]

Author: hanya
Date: Wed Nov 18 12:44:57 2015
New Revision: 1714989

URL: http://svn.apache.org/viewvc?rev=1714989=rev
Log:
#i72580# Add descriptions about State property and button command

Modified:
openoffice/trunk/main/offapi/com/sun/star/awt/UnoControlButtonModel.idl
openoffice/trunk/main/offapi/com/sun/star/awt/XButton.idl

Modified: 
openoffice/trunk/main/offapi/com/sun/star/awt/UnoControlButtonModel.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/UnoControlButtonModel.idl?rev=1714989=1714988=1714989=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/awt/UnoControlButtonModel.idl 
(original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/UnoControlButtonModel.idl Wed 
Nov 18 12:44:57 2015
@@ -224,7 +224,17 @@ published service UnoControlButtonModel
 

//-
 
-   /** specifies the state of the control.
+   /** specifies the state of the control. 
+
+If Toggle property is set to , the pressed 
state 
+is enabled and its pressed state can be obtained with this property.
+
+
+0: not pressed
+1: pressed
+2: don't know
+
+@see Toggle
 */
[property] short State;
 

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/XButton.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/XButton.idl?rev=1714989=1714988=1714989=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/awt/XButton.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/XButton.idl Wed Nov 18 
12:44:57 2015
@@ -63,6 +63,9 @@ published interface XButton: com::sun::s

//- 

/** sets a command string for pushing the button.
+
+@param Command
+value can be used to detect which button is pressed. 
 */
[oneway] void setActionCommand( [in] string Command ); 
  

svn commit: r1714201 - in /openoffice/trunk/main/offapi/com/sun/star: accessibility/ auth/ awt/ awt/grid/ awt/tree/ configuration/ deployment/ drawing/framework/ embed/ frame/ sdbcx/ sync/ table/ ucb/

[hanya]

Author: hanya
Date: Fri Nov 13 12:53:52 2015
New Revision: 1714201

URL: http://svn.apache.org/viewvc?rev=1714201=rev
Log:
#i126649# Fix wrong at tag names

Modified:
openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleText.idl
openoffice/trunk/main/offapi/com/sun/star/auth/XSSOManager.idl
openoffice/trunk/main/offapi/com/sun/star/awt/XSimpleTabController.idl
openoffice/trunk/main/offapi/com/sun/star/awt/grid/XGridDataModel.idl
openoffice/trunk/main/offapi/com/sun/star/awt/grid/XGridRowSelection.idl
openoffice/trunk/main/offapi/com/sun/star/awt/tree/XTreeControl.idl

openoffice/trunk/main/offapi/com/sun/star/configuration/AccessRootElement.idl
openoffice/trunk/main/offapi/com/sun/star/configuration/SetElement.idl

openoffice/trunk/main/offapi/com/sun/star/configuration/UpdateRootElement.idl
openoffice/trunk/main/offapi/com/sun/star/deployment/XPackage.idl
openoffice/trunk/main/offapi/com/sun/star/deployment/XPackageRegistry.idl
openoffice/trunk/main/offapi/com/sun/star/drawing/framework/XPane2.idl
openoffice/trunk/main/offapi/com/sun/star/embed/XCommonEmbedPersist.idl
openoffice/trunk/main/offapi/com/sun/star/embed/XEmbedObjectCreator.idl
openoffice/trunk/main/offapi/com/sun/star/embed/XEmbedObjectFactory.idl
openoffice/trunk/main/offapi/com/sun/star/embed/XEmbedPersist.idl
openoffice/trunk/main/offapi/com/sun/star/embed/XInsertObjectDialog.idl
openoffice/trunk/main/offapi/com/sun/star/frame/XStorable2.idl
openoffice/trunk/main/offapi/com/sun/star/sdbcx/XColumnsSupplier.idl
openoffice/trunk/main/offapi/com/sun/star/sync/SyncScheme.idl
openoffice/trunk/main/offapi/com/sun/star/table/TableSortField.idl
openoffice/trunk/main/offapi/com/sun/star/ucb/XDynamicResultSet.idl
openoffice/trunk/main/offapi/com/sun/star/ucb/XInteractionSupplyName.idl
openoffice/trunk/main/offapi/com/sun/star/ui/UIElementFactoryManager.idl
openoffice/trunk/main/offapi/com/sun/star/util/XModifiable2.idl

Modified: 
openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleText.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleText.idl?rev=1714201=1714200=1714201=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleText.idl 
(original)
+++ openoffice/trunk/main/offapi/com/sun/star/accessibility/XAccessibleText.idl 
Fri Nov 13 12:53:52 2015
@@ -312,7 +312,7 @@ published interface XAccessibleText : ::
 The first character of the new selection. 
 The valid range is 0..length.
 
-@parm nEndIndex
+@param nEndIndex
 The position after the last character of the new selection.
 The valid range is 0..length.
 

Modified: openoffice/trunk/main/offapi/com/sun/star/auth/XSSOManager.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/auth/XSSOManager.idl?rev=1714201=1714200=1714201=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/auth/XSSOManager.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/auth/XSSOManager.idl Fri Nov 13 
12:53:52 2015
@@ -72,7 +72,7 @@ published interface XSSOManager : ::com:
the name of the target/acceptor side principal to which the 
source
principal intends to authenticate.
 
-   @paran TargetHost
+   @param TargetHost
the host name associated with the target principal.
 
@returns

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/XSimpleTabController.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/XSimpleTabController.idl?rev=1714201=1714200=1714201=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/awt/XSimpleTabController.idl 
(original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/XSimpleTabController.idl Fri 
Nov 13 12:53:52 2015
@@ -55,7 +55,7 @@ published interface XSimpleTabController
 which can be used further to address this tab by using other methods
 of this interface.
 
-@return [long
+@return
 an unique ID for this new tab.
  */
 long insertTab();
@@ -139,7 +139,7 @@ published interface XSimpleTabController
 //-
 /** return the unique ID of the current active tab.
 
-@eturn  [long]
+@return  ID
 the ID of the active tab.
  */
 long getActiveTabID();

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/grid/XGridDataModel.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/grid/XGridDataModel.idl?rev=1714201

svn commit: r1712473 - in /openoffice/trunk/main: offapi/com/sun/star/drawing/ offapi/com/sun/star/geometry/ offapi/com/sun/star/report/ offapi/com/sun/star/sdb/ offapi/com/sun/star/sdbc/ offapi/com/s

[hanya]

Author: hanya
Date: Wed Nov  4 05:49:19 2015
New Revision: 1712473

URL: http://svn.apache.org/viewvc?rev=1712473=rev
Log:
#i126627# wrong type description in @see tag

Modified:
openoffice/trunk/main/offapi/com/sun/star/drawing/DrawPage.idl

openoffice/trunk/main/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
openoffice/trunk/main/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
openoffice/trunk/main/offapi/com/sun/star/report/XReportControlFormat.idl
openoffice/trunk/main/offapi/com/sun/star/report/XReportDefinition.idl
openoffice/trunk/main/offapi/com/sun/star/report/XReportEngine.idl
openoffice/trunk/main/offapi/com/sun/star/sdb/ErrorMessageDialog.idl
openoffice/trunk/main/offapi/com/sun/star/sdbc/XRowSetListener.idl
openoffice/trunk/main/offapi/com/sun/star/style/ParagraphProperties.idl
openoffice/trunk/main/offapi/com/sun/star/style/ParagraphStyle.idl
openoffice/trunk/main/offapi/com/sun/star/text/DocumentIndexFormat.idl
openoffice/trunk/main/offapi/com/sun/star/text/Footnote.idl
openoffice/trunk/main/offapi/com/sun/star/text/TextPortion.idl
openoffice/trunk/main/offapi/com/sun/star/text/TextTable.idl
openoffice/trunk/main/offapi/com/sun/star/text/XNumberingRulesSupplier.idl
openoffice/trunk/main/offapi/com/sun/star/text/XTextTableCursor.idl
openoffice/trunk/main/udkapi/com/sun/star/bridge/IiopBridge.idl
openoffice/trunk/main/udkapi/com/sun/star/bridge/UrpBridge.idl
openoffice/trunk/main/udkapi/com/sun/star/bridge/XBridge.idl

Modified: openoffice/trunk/main/offapi/com/sun/star/drawing/DrawPage.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/drawing/DrawPage.idl?rev=1712473=1712472=1712473=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/drawing/DrawPage.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/drawing/DrawPage.idl Wed Nov  4 
05:49:19 2015
@@ -69,9 +69,9 @@ published service DrawPage
Every draw page may contain a form layer - that is, a 
hierarchy of form elements. The layer can be
accessed using this interface.
 
-   @see com.sun.star.form.FormComponent
-   @see com.sun.star.form.FormComponents
-   @see com.sun.star.form.Forms
+   @see com::sun::star::form::FormComponent
+   @see com::sun::star::form::FormComponents
+   @see com::sun::star::form::Forms
*/
[optional] interface com::sun::star::form::XFormsSupplier; 
 }; 

Modified: 
openoffice/trunk/main/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl?rev=1712473=1712472=1712473=diff
==
--- 
openoffice/trunk/main/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl 
(original)
+++ 
openoffice/trunk/main/offapi/com/sun/star/geometry/IntegerBezierSegment2D.idl 
Wed Nov  4 05:49:19 2015
@@ -36,7 +36,7 @@ module com {  module sun {  module star
 the end point of the last curve, and the remaining members
 ignored.
 
-@see com.sun.star.rendering.XBezierPolyPolygon2D
+@see com::sun::star::rendering::XBezierPolyPolygon2D
 @since OpenOffice 2.0
  */
 struct IntegerBezierSegment2D

Modified: 
openoffice/trunk/main/offapi/com/sun/star/geometry/RealBezierSegment2D.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/geometry/RealBezierSegment2D.idl?rev=1712473=1712472=1712473=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/geometry/RealBezierSegment2D.idl 
(original)
+++ openoffice/trunk/main/offapi/com/sun/star/geometry/RealBezierSegment2D.idl 
Wed Nov  4 05:49:19 2015
@@ -36,7 +36,7 @@ module com {  module sun {  module star
 the end point of the last curve, and the remaining members
 ignored.
 
-@see com.sun.star.rendering.XBezierPolyPolygon2D
+@see com::sun::star::rendering::XBezierPolyPolygon2D
 @since OpenOffice 2.0
  */
 published struct RealBezierSegment2D

Modified: 
openoffice/trunk/main/offapi/com/sun/star/report/XReportControlFormat.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/report/XReportControlFormat.idl?rev=1712473=1712472=1712473=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/report/XReportControlFormat.idl 
(original)
+++ openoffice/trunk/main/offapi/com/sun/star/report/XReportControlFormat.idl 
Wed Nov  4 05:49:19 2015
@@ -352,7 +352,7 @@ published interface XReportControlFormat
 
 //-
 /**determins the type of the strike out of the character.
-@see

svn commit: r1707844 - /openoffice/trunk/main/i18npool/source/search/textsearch.cxx

[hanya]

Author: hanya
Date: Sat Oct 10 08:42:22 2015
New Revision: 1707844

URL: http://svn.apache.org/viewvc?rev=1707844=rev
Log:
#i107619# use next index to the last position from the offset when the match 
result is started at the end of thes string

Modified:
openoffice/trunk/main/i18npool/source/search/textsearch.cxx

Modified: openoffice/trunk/main/i18npool/source/search/textsearch.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/source/search/textsearch.cxx?rev=1707844=1707843=1707844=diff
==
--- openoffice/trunk/main/i18npool/source/search/textsearch.cxx (original)
+++ openoffice/trunk/main/i18npool/source/search/textsearch.cxx Sat Oct 10 
08:42:22 2015
@@ -241,10 +241,18 @@ SearchResult TextSearch::searchForward(
 
 sres = (this->*fnForward)( in_str, newStartPos, newEndPos );
 
+sal_Int32 nOffsetLength = offset.getLength();
+sal_Int32 nStartOffset = 0;
 for ( int k = 0; k < sres.startOffset.getLength(); k++ )
 {
-if (sres.startOffset[k])
- sres.startOffset[k] = offset[sres.startOffset[k]];
+nStartOffset = sres.startOffset[k];
+if ( nStartOffset )
+{
+if ( nStartOffset < nOffsetLength )
+sres.startOffset[k] = offset[nStartOffset];
+else
+sres.startOffset[k] = offset[offset.getLength()-1] +1;
+}
 // JP 20.6.2001: end is ever exclusive and then don't return
 //   the position of the next character - return the
 //   next position behind the last found character!
@@ -330,6 +338,8 @@ SearchResult TextSearch::searchBackward(
 
 sres = (this->*fnBackward)( in_str, newStartPos, newEndPos );
 
+sal_Int32 nOffsetLength = offset.getLength();
+sal_Int32 nEndOffset = 0;
 for ( int k = 0; k < sres.startOffset.getLength(); k++ )
 {
 if (sres.startOffset[k])
@@ -338,8 +348,14 @@ SearchResult TextSearch::searchBackward(
 //   the position of the next character - return the
 //   next position behind the last found character!
 //   "a b c" find "b" must return 2,3 and not 2,4!!!
-if (sres.endOffset[k])
- sres.endOffset[k] = offset[sres.endOffset[k]];
+nEndOffset = sres.endOffset[k];
+if ( nEndOffset )
+{
+if ( nEndOffset < nOffsetLength )
+sres.endOffset[k] = offset[nEndOffset];
+else
+sres.endOffset[k] = offset[offset.getLength()-1] +1;
+}
 }
 }
 else

svn commit: r1668939 - in /openoffice/trunk/main/svtools: inc/svtools/treelist.hxx source/contnr/svtreebx.cxx

[hanya]

Author: hanya
Date: Tue Mar 24 17:05:34 2015
New Revision: 1668939

URL: http://svn.apache.org/r1668939
Log:
#i125147# check the pointer while get accessible state set

Modified:
openoffice/trunk/main/svtools/inc/svtools/treelist.hxx
openoffice/trunk/main/svtools/source/contnr/svtreebx.cxx

Modified: openoffice/trunk/main/svtools/inc/svtools/treelist.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/inc/svtools/treelist.hxx?rev=1668939r1=1668938r2=1668939view=diff
==
--- openoffice/trunk/main/svtools/inc/svtools/treelist.hxx (original)
+++ openoffice/trunk/main/svtools/inc/svtools/treelist.hxx Tue Mar 24 17:05:34 
2015
@@ -411,14 +411,14 @@ inline sal_Bool SvListView::IsSelected(
DBG_ASSERT(pEntry,IsExpanded:No Entry);
SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry );
DBG_ASSERT(pData,Entry not in Table);
-   return pData-IsSelected();
+   return pData  pData-IsSelected();
 }
 inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const
 {
DBG_ASSERT(pEntry,IsExpanded:No Entry);
SvViewData* pData = (SvViewData*)aDataTable.Get( (sal_uLong)pEntry );
DBG_ASSERT(pData,Entry not in Table);
-   return pData-HasFocus();
+   return pData  pData-HasFocus();
 }
 inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus ) 
const
 {

Modified: openoffice/trunk/main/svtools/source/contnr/svtreebx.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/contnr/svtreebx.cxx?rev=1668939r1=1668938r2=1668939view=diff
==
--- openoffice/trunk/main/svtools/source/contnr/svtreebx.cxx (original)
+++ openoffice/trunk/main/svtools/source/contnr/svtreebx.cxx Tue Mar 24 
17:05:34 2015
@@ -2757,32 +2757,32 @@ void SvTreeListBox::FillAccessibleEntryS
 {
DBG_ASSERT( pEntry, SvTreeListBox::FillAccessibleEntryStateSet: 
invalid entry );
 
-   if ( pEntry-HasChildsOnDemand() || pEntry-HasChilds() )
-   {
-   rStateSet.AddState( AccessibleStateType::EXPANDABLE );
-   if ( IsExpanded( pEntry ) )
-   rStateSet.AddState( 
(sal_Int16)AccessibleStateType::EXPANDED );
-   }
+if ( pEntry )
+{
+if ( pEntry-HasChildsOnDemand() || pEntry-HasChilds() )
+{
+rStateSet.AddState( AccessibleStateType::EXPANDABLE );
+if ( IsExpanded( pEntry ) )
+rStateSet.AddState( (sal_Int16)AccessibleStateType::EXPANDED );
+}
 
-   if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
-   rStateSet.AddState( AccessibleStateType::CHECKED );
-   if ( IsEntryVisible( pEntry ) )
-   rStateSet.AddState( AccessibleStateType::VISIBLE );
-   if ( IsSelected( pEntry ) )
-   rStateSet.AddState( AccessibleStateType::SELECTED );
-   if ( IsEnabled() )
-   {
-   rStateSet.AddState( AccessibleStateType::ENABLED );
-   rStateSet.AddState( AccessibleStateType::FOCUSABLE );
-   rStateSet.AddState( AccessibleStateType::SELECTABLE );
-   SvViewDataEntry* pViewDataNewCur = 0;
-   if( pEntry )
-   {
-   pViewDataNewCur= GetViewDataEntry(pEntry);
-   if(pViewDataNewCur-HasFocus())
-   rStateSet.AddState( 
AccessibleStateType::FOCUSED );
-   }
-   }
+if ( GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
+rStateSet.AddState( AccessibleStateType::CHECKED );
+if ( IsEntryVisible( pEntry ) )
+rStateSet.AddState( AccessibleStateType::VISIBLE );
+if ( IsSelected( pEntry ) )
+rStateSet.AddState( AccessibleStateType::SELECTED );
+if ( IsEnabled() )
+{
+rStateSet.AddState( AccessibleStateType::ENABLED );
+rStateSet.AddState( AccessibleStateType::FOCUSABLE );
+rStateSet.AddState( AccessibleStateType::SELECTABLE );
+SvViewDataEntry* pViewDataNewCur = 0;
+pViewDataNewCur = GetViewDataEntry(pEntry);
+if( pViewDataNewCur  pViewDataNewCur-HasFocus() )
+rStateSet.AddState( AccessibleStateType::FOCUSED );
+}
+}
 }
 
 Rectangle SvTreeListBox::GetBoundingRect( SvLBoxEntry* pEntry )

svn commit: r1661141 - in /openoffice/trunk/main/svx: inc/svx/dialogs.hrc source/dialog/sdstring.src

[hanya]

Author: hanya
Date: Fri Feb 20 15:32:21 2015
New Revision: 1661141

URL: http://svn.apache.org/r1661141
Log:
#i126116# nonlocalizable arrow names

Modified:
openoffice/trunk/main/svx/inc/svx/dialogs.hrc
openoffice/trunk/main/svx/source/dialog/sdstring.src

Modified: openoffice/trunk/main/svx/inc/svx/dialogs.hrc
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/dialogs.hrc?rev=1661141r1=1661140r2=1661141view=diff
==
--- openoffice/trunk/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/trunk/main/svx/inc/svx/dialogs.hrc Fri Feb 20 15:32:21 2015
@@ -804,27 +804,43 @@
 #define RID_SVXSTR_LEND9_DEF   (RID_SVX_START + 779)
 #define RID_SVXSTR_LEND10_DEF  (RID_SVX_START + 780)
 #define RID_SVXSTR_LEND11_DEF  (RID_SVX_START + 781)
-#define RID_SVXSTR_LEND0   (RID_SVX_START 
+ 782)
-#define RID_SVXSTR_LEND1   (RID_SVX_START 
+ 783)
-#define RID_SVXSTR_LEND2   (RID_SVX_START 
+ 784)
-#define RID_SVXSTR_LEND3   (RID_SVX_START 
+ 785)
-#define RID_SVXSTR_LEND4   (RID_SVX_START 
+ 786)
-#define RID_SVXSTR_LEND5   (RID_SVX_START 
+ 787)
-#define RID_SVXSTR_LEND6   (RID_SVX_START 
+ 788)
-#define RID_SVXSTR_LEND7   (RID_SVX_START 
+ 789)
-#define RID_SVXSTR_LEND8   (RID_SVX_START 
+ 790)
-#define RID_SVXSTR_LEND9   (RID_SVX_START 
+ 791)
-#define RID_SVXSTR_LEND10  (RID_SVX_START 
+ 792)
-#define RID_SVXSTR_LEND11  (RID_SVX_START 
+ 793)
+#define RID_SVXSTR_LEND12_DEF  (RID_SVX_START + 782)
+#define RID_SVXSTR_LEND13_DEF  (RID_SVX_START + 783)
+#define RID_SVXSTR_LEND14_DEF  (RID_SVX_START + 784)
+#define RID_SVXSTR_LEND15_DEF  (RID_SVX_START + 785)
+#define RID_SVXSTR_LEND16_DEF  (RID_SVX_START + 786)
+#define RID_SVXSTR_LEND17_DEF  (RID_SVX_START + 787)
+#define RID_SVXSTR_LEND18_DEF  (RID_SVX_START + 788)
+#define RID_SVXSTR_LEND19_DEF  (RID_SVX_START + 789)
+#define RID_SVXSTR_LEND0   (RID_SVX_START 
+ 790)
+#define RID_SVXSTR_LEND1   (RID_SVX_START 
+ 791)
+#define RID_SVXSTR_LEND2   (RID_SVX_START 
+ 792)
+#define RID_SVXSTR_LEND3   (RID_SVX_START 
+ 793)
+#define RID_SVXSTR_LEND4   (RID_SVX_START 
+ 794)
+#define RID_SVXSTR_LEND5   (RID_SVX_START 
+ 795)
+#define RID_SVXSTR_LEND6   (RID_SVX_START 
+ 796)
+#define RID_SVXSTR_LEND7   (RID_SVX_START 
+ 797)
+#define RID_SVXSTR_LEND8   (RID_SVX_START 
+ 798)
+#define RID_SVXSTR_LEND9   (RID_SVX_START 
+ 799)
+#define RID_SVXSTR_LEND10  (RID_SVX_START 
+ 800)
+#define RID_SVXSTR_LEND11  (RID_SVX_START 
+ 801)
+#define RID_SVXSTR_LEND12  (RID_SVX_START 
+ 802)
+#define RID_SVXSTR_LEND13  (RID_SVX_START 
+ 803)
+#define RID_SVXSTR_LEND14  (RID_SVX_START 
+ 804)
+#define RID_SVXSTR_LEND15  (RID_SVX_START 
+ 805)
+#define RID_SVXSTR_LEND16  (RID_SVX_START 
+ 806)
+#define RID_SVXSTR_LEND17  (RID_SVX_START 
+ 807)
+#define RID_SVXSTR_LEND18  (RID_SVX_START 
+ 808)
+#define RID_SVXSTR_LEND19  (RID_SVX_START 
+ 809)
 #define RID_SVXSTR_LEND_DEF_START  RID_SVXSTR_LEND0_DEF
-#define RID_SVXSTR_LEND_DEF_END
RID_SVXSTR_LEND11_DEF
+#define RID_SVXSTR_LEND_DEF_END
RID_SVXSTR_LEND19_DEF
 #define RID_SVXSTR_LEND_START  RID_SVXSTR_LEND0
-#define RID_SVXSTR_LEND_END
RID_SVXSTR_LEND11
+#define RID_SVXSTR_LEND_END
RID_SVXSTR_LEND19
 
-#define RID_SVXSTR_QRY_PRINT_TITLE (RID_SVX_START + 802)
-#define RID_SVXSTR_QRY_PRINT_MSG(RID_SVX_START + 803)
-#define RID_SVXSTR_QRY_PRINT_ALL

svn commit: r1656732 - /openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu

[hanya]

Author: hanya
Date: Tue Feb  3 14:02:03 2015
New Revision: 1656732

URL: http://svn.apache.org/r1656732
Log:
#i89465# fix label width of Avery j8159

Modified:

openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu

Modified: 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu?rev=1656732r1=1656731r2=1656732view=diff
==
--- 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu 
(original)
+++ 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu 
Tue Feb  3 14:02:03 2015
@@ -895,7 +895,7 @@
/prop
prop oor:name=Measure
 
-
valueS;6654;3386;6400;3386;646;1306;3;8;21000;29700/value
+
valueS;6654;3386;6350;3386;646;1306;3;8;21000;29700/value
/prop
/node
node oor:name=L79 oor:op=replace 
oor:finalized=true

svn commit: r1656484 [2/2] - /openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu

[hanya]

Modified: 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu?rev=1656484r1=1656483r2=1656484view=diff
==
--- 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu 
(original)
+++ 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu 
Mon Feb  2 15:17:50 2015
@@ -37,7 +37,7 @@
/prop
prop oor:name=Measure
 
-valueS;14732;2000;14732;2000;3134;1843;1;13/value
+
valueS;14732;2000;14732;2000;3134;1843;1;13;21000;29700/value
/prop
/node
node oor:name=L1 oor:op=replace 
oor:finalized=true
@@ -48,7 +48,7 @@
/prop
prop oor:name=Measure
 
-valueS;8128;4657;7874;4657;2499;872;2;6/value
+
valueS;8128;4657;7874;4657;2499;872;2;6;21000;29700/value
/prop
/node
node oor:name=L2 oor:op=replace 
oor:finalized=true
@@ -59,7 +59,7 @@
/prop
prop oor:name=Measure
 
-valueS;21000;29700;21000;29700;0;0;1;1/value
+
valueS;21000;29700;21000;29700;0;0;1;1;21000;29700/value
/prop
/node
node oor:name=L3 oor:op=replace 
oor:finalized=true
@@ -70,7 +70,7 @@
/prop
prop oor:name=Measure
 
-valueS;24500;17000;24500;17000;2600;2000;1;1/value
+
valueS;24500;17000;24500;17000;2600;2000;1;1;21000;29700/value
/prop
/node
node oor:name=L4 oor:op=replace 
oor:finalized=true
@@ -81,7 +81,7 @@
/prop
prop oor:name=Measure
 
-valueS;21000;29700;21000;29700;0;0;1;1/value
+
valueS;21000;29700;21000;29700;0;0;1;1;21000;29700/value
/prop
/node
node oor:name=L5 oor:op=replace 
oor:finalized=true
@@ -92,7 +92,7 @@
/prop
prop oor:name=Measure
 
-valueS;6604;3810;6350;3810;720;1515;3;7/value
+
valueS;6604;3810;6350;3810;720;1515;3;7;21000;29700/value
/prop
/node
node oor:name=L6 oor:op=replace 
oor:finalized=true
@@ -103,7 +103,7 @@
/prop
prop oor:name=Measure
 
-valueS;10160;3810;9906;3810;467;1515;2;7/value
+
valueS;10160;3810;9906;3810;467;1515;2;7;21000;29700/value
/prop
/node
node oor:name=L7 oor:op=replace 
oor:finalized=true
@@ -114,7 +114,7 @@
/prop
prop oor:name=Measure
 
-valueS;10160;6773;9906;6773;467;1304;2;4/value
+
valueS;10160;6773;9906;6773;467;1304;2;4;21000;29700/value
/prop
/node
node oor:name=L8 oor:op=replace 
oor:finalized=true
@@ -125,7 +125,7 @@
/prop
prop oor:name=Measure
 
-valueS;7620;5927;7000;5200;3190;3360;2;4/value
+
valueS;7620;5927;7000;5200;3190;3360;2;4;21000;29700/value
/prop
/node
node oor:name=L9 oor:op=replace 
oor:finalized=true
@@ -136,7 +136,7 @@
/prop
prop oor:name=Measure
 
-valueS;8128;3810;7620;3175;2626;3738;2;6/value
+
valueS;8128;3810;7620;3175;2626;3738;2;6;21000;29700/value
/prop
/node
node oor:name=L10 oor:op=replace 
oor:finalized=true
@@ -147,7 +147,7 @@
/prop
prop oor:name=Measure
 
-valueS;4260;5080;3810;3810;2205;2785;4;5/value
+
valueS;4260;5080;3810;3810;2205;2785;4;5;21000;29700/value
/prop
/node
node oor:name=L11 oor:op=replace 

svn commit: r1656484 [1/2] - /openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu

[hanya]

Author: hanya
Date: Mon Feb  2 15:17:50 2015
New Revision: 1656484

URL: http://svn.apache.org/r1656484
Log:
#i18217# add width and height of page for part of existing label definitions

Modified:

openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/Labels.xcu

svn commit: r1656211 - in /openoffice/trunk/main: helpcontent2/source/text/shared/01/ officecfg/registry/schema/org/openoffice/Office/ sw/source/ui/app/ sw/source/ui/envelp/ sw/source/ui/inc/

[hanya]

Author: hanya
Date: Sat Jan 31 16:55:56 2015
New Revision: 1656211

URL: http://svn.apache.org/r1656211
Log:
#i53718# add support of paper size for label document

Modified:
openoffice/trunk/main/helpcontent2/source/text/shared/01/01010202.xhp

openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Labels.xcs

openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
openoffice/trunk/main/sw/source/ui/app/applab.cxx
openoffice/trunk/main/sw/source/ui/envelp/label1.cxx
openoffice/trunk/main/sw/source/ui/envelp/labelcfg.cxx
openoffice/trunk/main/sw/source/ui/envelp/labfmt.cxx
openoffice/trunk/main/sw/source/ui/envelp/labfmt.hrc
openoffice/trunk/main/sw/source/ui/envelp/labfmt.hxx
openoffice/trunk/main/sw/source/ui/envelp/labfmt.src
openoffice/trunk/main/sw/source/ui/envelp/labimg.cxx
openoffice/trunk/main/sw/source/ui/envelp/labimp.hxx
openoffice/trunk/main/sw/source/ui/inc/labimg.hxx

Modified: openoffice/trunk/main/helpcontent2/source/text/shared/01/01010202.xhp
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/shared/01/01010202.xhp?rev=1656211r1=1656210r2=1656211view=diff
==
--- openoffice/trunk/main/helpcontent2/source/text/shared/01/01010202.xhp 
(original)
+++ openoffice/trunk/main/helpcontent2/source/text/shared/01/01010202.xhp Sat 
Jan 31 16:55:56 2015
@@ -68,6 +68,12 @@
 bookmark xml-lang=en-US branch=hid/sw:NumericField:TP_LAB_FMT:FLD_ROWS 
id=bm_id3153146 localize=false/
 paragraph role=heading id=hd_id3154143 xml-lang=en-US level=2 
l10n=U oldref=17Rows/paragraph
 paragraph role=paragraph id=par_id3145119 xml-lang=en-US l10n=U 
oldref=18ahelp hid=SW:NUMERICFIELD:TP_LAB_FMT:FLD_ROWSEnter the number 
of labels or business cards that you want to span the height of the 
page./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/sw:NumericField:TP_LAB_FMT:FLD_PAPER_WIDTH id=bm_id3153156 
localize=false/
+paragraph role=paragraph id=par_id3145129 xml-lang=en-US l10n=U 
oldref=18ahelp hid=SW:NUMERICFIELD:TP_LAB_FMT:FLD_PAPER_WIDTHDisplays 
the width of the paper which the labels or business cards are ordered. If you 
are defining a custom format, enter a value here. If this value is zero, the 
paper width is calculated from the width of the label./ahelp/paragraph
+paragraph role=heading id=hd_id3154153 xml-lang=en-US level=2 
l10n=U oldref=17Paper Width/paragraph
+bookmark xml-lang=en-US 
branch=hid/sw:NumericField:TP_LAB_FMT:FLD_PAPER_HEIGHT id=bm_id3153166 
localize=false/
+paragraph role=heading id=hd_id3154163 xml-lang=en-US level=2 
l10n=U oldref=17Paper Height/paragraph
+paragraph role=paragraph id=par_id3145139 xml-lang=en-US l10n=U 
oldref=18ahelp hid=SW:NUMERICFIELD:TP_LAB_FMT:FLD_PAPER_HEIGHTDisplays 
the height of the paper which the labels or business cards are ordered. If you 
are defining a custom format, enter a value here. If this value is zero for 
sheet format, the paper height is calculated from the height of the 
label./ahelp/paragraph
 bookmark xml-lang=en-US branch=hid/sw:PushButton:TP_LAB_FMT:PB_SAVE 
id=bm_id3153716 localize=false/
 paragraph role=heading id=hd_id3147336 xml-lang=en-US level=2 
l10n=U oldref=19Save/paragraph
 paragraph role=paragraph id=par_id3156152 xml-lang=en-US l10n=U 
oldref=20ahelp hid=SW_PUSHBUTTON_TP_LAB_FMT_PB_SAVESaves the current 
label or business card format./ahelp/paragraph

Modified: 
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Labels.xcs?rev=1656211r1=1656210r2=1656211view=diff
==
--- 
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
 (original)
+++ 
openoffice/trunk/main/officecfg/registry/schema/org/openoffice/Office/Labels.xcs
 Sat Jan 31 16:55:56 2015
@@ -40,10 +40,10 @@
/prop
prop oor:name=Measure oor:type=xs:string
!--Label: Contains the measurement data of the 
label contatenated by a colon (;) in the following order: 
-   'C' or 'S';Horizontal Distance;Vertical 
Distance;Width;Height;Left margin;Upper margin;Columns;Rows while 'C' marks a 
continuous label and 'S' marks a sheet
+   'C' or 'S';Horizontal Distance;Vertical 
Distance;Width;Height;Left margin;Upper margin;Columns;Rows;Paper Width;Paper 
Height while 'C' marks a continuous label and 'S' marks a sheet
--
info
-   descContains the measurement data of 
the label concatenated by a colon (;) in the following order: 'C' or 
'S';Horizontal Distance;Vertical Distance;Width;Height;Left margin;Upper 
margin;Columns

svn commit: r1656067 - in /openoffice/trunk/main: helpcontent2/source/text/scalc/01/12090101.xhp sc/source/ui/dbgui/dapidata.cxx sc/source/ui/dbgui/dapitype.src sc/source/ui/inc/dapidata.hxx

[hanya]

Author: hanya
Date: Fri Jan 30 17:41:05 2015
New Revision: 1656067

URL: http://svn.apache.org/r1656067
Log:
#i105692# rearrange the order of the controls and fix name of type

Modified:
openoffice/trunk/main/helpcontent2/source/text/scalc/01/12090101.xhp
openoffice/trunk/main/sc/source/ui/dbgui/dapidata.cxx
openoffice/trunk/main/sc/source/ui/dbgui/dapitype.src
openoffice/trunk/main/sc/source/ui/inc/dapidata.hxx

Modified: openoffice/trunk/main/helpcontent2/source/text/scalc/01/12090101.xhp
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/scalc/01/12090101.xhp?rev=1656067r1=1656066r2=1656067view=diff
==
--- openoffice/trunk/main/helpcontent2/source/text/scalc/01/12090101.xhp 
(original)
+++ openoffice/trunk/main/helpcontent2/source/text/scalc/01/12090101.xhp Fri 
Jan 30 17:41:05 2015
@@ -48,12 +48,12 @@
 bookmark xml-lang=en-US 
branch=hid/sc:ListBox:RID_SCDLG_DAPIDATA:LB_DATABASE id=bm_id3154684 
localize=false/
 paragraph role=heading id=hd_id3151041 xml-lang=en-US level=3 
l10n=U oldref=5Database/paragraph
 paragraph role=paragraph id=par_id3156424 xml-lang=en-US l10n=U 
oldref=6ahelp hid=SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_DATABASESelect the 
database that contains the data source that you want to use./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE id=bm_id3153726 
localize=false/
+paragraph role=heading id=hd_id3147428 xml-lang=en-US level=3 
l10n=U oldref=9Type/paragraph
+paragraph role=paragraph id=par_id3150010 xml-lang=en-US l10n=U 
oldref=10ahelp hid=SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_OBJTYPESelect the 
source type to be shown in the data source./ahelp You can choose from four 
source types: Table, Query and SQL or SQL (Native)./paragraph
 bookmark xml-lang=en-US 
branch=hid/sc:ComboBox:RID_SCDLG_DAPIDATA:CB_OBJECT id=bm_id3151112 
localize=false/
 paragraph role=heading id=hd_id3145364 xml-lang=en-US level=3 
l10n=U oldref=7Data source/paragraph
 paragraph role=paragraph id=par_id3149260 xml-lang=en-US l10n=U 
oldref=8ahelp hid=SC:COMBOBOX:RID_SCDLG_DAPIDATA:CB_OBJECTSelect the 
data source that you want to use./ahelp/paragraph
-bookmark xml-lang=en-US 
branch=hid/sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE id=bm_id3153726 
localize=false/
-paragraph role=heading id=hd_id3147428 xml-lang=en-US level=3 
l10n=U oldref=9Type/paragraph
-paragraph role=paragraph id=par_id3150010 xml-lang=en-US l10n=U 
oldref=10ahelp hid=SC:LISTBOX:RID_SCDLG_DAPIDATA:LB_OBJTYPEClick the 
source type of for the selected data source./ahelp You can choose from four 
source types: Table, Query and SQL or SQL (Native)./paragraph
 section id=relatedtopics
 paragraph role=paragraph id=par_id3147348 xml-lang=en-US l10n=U 
oldref=11link href=text/scalc/01/12090102.xhp name=Pivot table 
dialogPivot table dialog/link/paragraph
 /section

Modified: openoffice/trunk/main/sc/source/ui/dbgui/dapidata.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/dbgui/dapidata.cxx?rev=1656067r1=1656066r2=1656067view=diff
==
--- openoffice/trunk/main/sc/source/ui/dbgui/dapidata.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/dbgui/dapidata.cxx Fri Jan 30 17:41:05 
2015
@@ -68,10 +68,10 @@ ScDataPilotDatabaseDlg::ScDataPilotDatab
 aFlFrame( this, ScResId( FL_FRAME ) ),
aFtDatabase ( this, ScResId( FT_DATABASE ) ),
aLbDatabase ( this, ScResId( LB_DATABASE ) ),
-   aFtObject   ( this, ScResId( FT_OBJECT ) ),
-   aCbObject   ( this, ScResId( CB_OBJECT ) ),
aFtType ( this, ScResId( FT_OBJTYPE ) ),
aLbType ( this, ScResId( LB_OBJTYPE ) ),
+   aFtObject   ( this, ScResId( FT_OBJECT ) ),
+   aCbObject   ( this, ScResId( CB_OBJECT ) ),
aBtnOk  ( this, ScResId( BTN_OK ) ),
aBtnCancel  ( this, ScResId( BTN_CANCEL ) ),
aBtnHelp( this, ScResId( BTN_HELP ) )

Modified: openoffice/trunk/main/sc/source/ui/dbgui/dapitype.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/dbgui/dapitype.src?rev=1656067r1=1656066r2=1656067view=diff
==
--- openoffice/trunk/main/sc/source/ui/dbgui/dapitype.src (original)
+++ openoffice/trunk/main/sc/source/ui/dbgui/dapitype.src Fri Jan 30 17:41:05 
2015
@@ -247,7 +247,7 @@ ModalDialog RID_SCDLG_DAPIDATA
 
FixedText FT_OBJECT
{
-Pos = MAP_APPFONT ( 12 , 30 ) ;
+Pos = MAP_APPFONT ( 12 , 46 ) ;
 Size = MAP_APPFONT ( 52 , 8 ) ;
Text [ en-US ] = Data so~urce;
};
@@ -255,7 +255,7 @@ ModalDialog RID_SCDLG_DAPIDATA
{
HelpID = sc:ComboBox:RID_SCDLG_DAPIDATA:CB_OBJECT;
Border = TRUE ;
-Pos = MAP_APPFONT ( 66 , 28 ) ;
+Pos

svn commit: r1656166 - /openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

[hanya]

Author: hanya
Date: Sat Jan 31 06:50:26 2015
New Revision: 1656166

URL: http://svn.apache.org/r1656166
Log:
#i116863# remove extra spaces from labels of line spacing commands

Modified:

openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

Modified: 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu?rev=1656166r1=1656165r2=1656166view=diff
==
--- 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
 (original)
+++ 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
 Sat Jan 31 06:50:26 2015
@@ -4832,7 +4832,7 @@
 /node
 node oor:name=.uno:SpacePara15 oor:op=replace
 prop oor:name=Label oor:type=xs:string
-value xml:lang=en-USLine Spacing : 1.5/value
+value xml:lang=en-USLine Spacing: 1.5/value
 /prop
 prop oor:name=Properties oor:type=xs:int
 value15/value
@@ -4840,7 +4840,7 @@
 /node
 node oor:name=.uno:SpacePara2 oor:op=replace
 prop oor:name=Label oor:type=xs:string
-value xml:lang=en-USLine Spacing : 2/value
+value xml:lang=en-USLine Spacing: 2/value
 /prop
 prop oor:name=Properties oor:type=xs:int
 value15/value

svn commit: r1656169 - in /openoffice/trunk/main/xmloff/source/forms: elementimport.cxx elementimport.hxx

[hanya]

Author: hanya
Date: Sat Jan 31 07:26:19 2015
New Revision: 1656169

URL: http://svn.apache.org/r1656169
Log:
#i114416# use default service name for scroll bar if failed to detect the 
control-implementation

Modified:
openoffice/trunk/main/xmloff/source/forms/elementimport.cxx
openoffice/trunk/main/xmloff/source/forms/elementimport.hxx

Modified: openoffice/trunk/main/xmloff/source/forms/elementimport.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/forms/elementimport.cxx?rev=1656169r1=1656168r2=1656169view=diff
==
--- openoffice/trunk/main/xmloff/source/forms/elementimport.cxx (original)
+++ openoffice/trunk/main/xmloff/source/forms/elementimport.cxx Sat Jan 31 
07:26:19 2015
@@ -190,7 +190,7 @@ namespace xmloff
 }
 
 if ( !m_sServiceName.getLength() )
-determineDefaultServiceName();
+m_sServiceName = determineDefaultServiceName();
 
 // create the object *now*. This allows setting properties in the 
various handleAttribute methods.
 // (Though currently not all code is migrated to this pattern, most 
attributes are still handled
@@ -712,6 +712,7 @@ namespace xmloff
 case OControlElement::IMAGE_FRAME:   pServiceName = 
com.sun.star.form.component.DatabaseImageControl; break;
 case OControlElement::HIDDEN:pServiceName = 
com.sun.star.form.component.HiddenControl; break;
 case OControlElement::GRID:  pServiceName = 
com.sun.star.form.component.GridControl; break;
+case OControlElement::VALUERANGE:pServiceName = 
com.sun.star.form.component.ScrollBar; break;
 case OControlElement::TIME:  pServiceName = 
com.sun.star.form.component.DateField; break;
 case OControlElement::DATE:  pServiceName = 
com.sun.star.form.component.TimeField; break;
 default: break;
@@ -2220,6 +2221,12 @@ namespace xmloff
return new OControlImport(m_rFormImport, *this, 
_nPrefix, _rLocalName, m_xMeAsContainer, _eType);
}
}
+
+   //-
+::rtl::OUString OFormImport::determineDefaultServiceName() const
+{
+return ::rtl::OUString::createFromAscii( 
com.sun.star.form.component.Form );
+}
 
 //.
 }  // namespace xmloff

Modified: openoffice/trunk/main/xmloff/source/forms/elementimport.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/xmloff/source/forms/elementimport.hxx?rev=1656169r1=1656168r2=1656169view=diff
==
--- openoffice/trunk/main/xmloff/source/forms/elementimport.hxx (original)
+++ openoffice/trunk/main/xmloff/source/forms/elementimport.hxx Sat Jan 31 
07:26:19 2015
@@ -740,7 +740,7 @@ namespace xmloff
sal_uInt16 _nPrefix, const ::rtl::OUString 
_rLocalName,
OControlElement::ElementType _eType );
 
-
+   virtual ::rtl::OUString determineDefaultServiceName() const;
void implTranslateStringListProperty(const ::rtl::OUString 
_rPropertyName, const ::rtl::OUString _rValue);
};
 

svn commit: r1655033 - in /openoffice/trunk/main/sc: inc/ViewSettingsSequenceDefines.hxx source/ui/view/viewdata.cxx

[hanya]

Author: hanya
Date: Tue Jan 27 13:25:47 2015
New Revision: 1655033

URL: http://svn.apache.org/r1655033
Log:
#i85241# store settings about value highlighting in document

Modified:
openoffice/trunk/main/sc/inc/ViewSettingsSequenceDefines.hxx
openoffice/trunk/main/sc/source/ui/view/viewdata.cxx

Modified: openoffice/trunk/main/sc/inc/ViewSettingsSequenceDefines.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/ViewSettingsSequenceDefines.hxx?rev=1655033r1=1655032r2=1655033view=diff
==
--- openoffice/trunk/main/sc/inc/ViewSettingsSequenceDefines.hxx (original)
+++ openoffice/trunk/main/sc/inc/ViewSettingsSequenceDefines.hxx Tue Jan 27 
13:25:47 2015
@@ -27,7 +27,7 @@
 // this are the defines for the position of the settings in the
 // ViewSettingsSequence
 
-#define SC_VIEWSETTINGS_COUNT  23
+#define SC_VIEWSETTINGS_COUNT  24
 
 #define SC_VIEW_ID 0
 #define SC_TABLE_VIEWSETTINGS  1
@@ -45,13 +45,14 @@
 #define SC_COLROWHDR   13
 #define SC_SHEETTABS   14
 #define SC_OUTLSYMB15
-#define SC_SNAPTORASTER16
-#define SC_RASTERVIS   17
-#define SC_RASTERRESX  18
-#define SC_RASTERRESY  19
-#define SC_RASTERSUBX  20
-#define SC_RASTERSUBY  21
-#define SC_RASTERSYNC  22
+#define SC_VALUE_HIGHLIGHTING  16
+#define SC_SNAPTORASTER17
+#define SC_RASTERVIS   18
+#define SC_RASTERRESX  19
+#define SC_RASTERRESY  20
+#define SC_RASTERSUBX  21
+#define SC_RASTERSUBY  22
+#define SC_RASTERSYNC  23
 
 
 // this are the defines for the position of the settings in the

Modified: openoffice/trunk/main/sc/source/ui/view/viewdata.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/view/viewdata.cxx?rev=1655033r1=1655032r2=1655033view=diff
==
--- openoffice/trunk/main/sc/source/ui/view/viewdata.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/view/viewdata.cxx Tue Jan 27 13:25:47 
2015
@@ -2766,6 +2766,8 @@ void ScViewData::WriteUserDataSequence(u
ScUnoHelpFunctions::SetBoolInAny( 
pSettings[SC_SHEETTABS].Value, pOptions-GetOption( VOPT_TABCONTROLS ) );
pSettings[SC_OUTLSYMB].Name = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_OUTLSYMB));
ScUnoHelpFunctions::SetBoolInAny( 
pSettings[SC_OUTLSYMB].Value, pOptions-GetOption( VOPT_OUTLINER ) );
+   pSettings[SC_VALUE_HIGHLIGHTING].Name = rtl::OUString( 
RTL_CONSTASCII_USTRINGPARAM( SC_UNO_VALUEHIGH ) );
+   ScUnoHelpFunctions::SetBoolInAny( 
pSettings[SC_VALUE_HIGHLIGHTING].Value, pOptions-GetOption( VOPT_SYNTAX ) );
 
const ScGridOptions aGridOpt = 
pOptions-GetGridOptions();
pSettings[SC_SNAPTORASTER].Name = 
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_SNAPTORASTER));
@@ -2916,6 +2918,8 @@ void ScViewData::ReadUserDataSequence(co
 if ( rSettings[i].Value = nTemp16 )
 pOptions-SetObjMode( VOBJ_TYPE_DRAW, (nTemp16 == 1) ? 
VOBJ_MODE_HIDE : VOBJ_MODE_SHOW );
 }
+else if ( sName.compareToAscii( SC_UNO_VALUEHIGH ) == 0 )
+pOptions-SetOption( VOPT_SYNTAX, 
ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
else
{
ScGridOptions aGridOpt(pOptions-GetGridOptions());

svn commit: r1654744 - in /openoffice/trunk/main: toolkit/source/helper/ xmlscript/dtd/ xmlscript/source/xmldlg_imexp/

[hanya]

Author: hanya
Date: Mon Jan 26 09:06:52 2015
New Revision: 1654744

URL: http://svn.apache.org/r1654744
Log:
#i98734# store and load ScaleMode property of image control on dialogs

Suggested by: Frank Schönheit frank.schoenh...@gmx.de

Modified:
openoffice/trunk/main/toolkit/source/helper/property.cxx
openoffice/trunk/main/xmlscript/dtd/dialog.dtd
openoffice/trunk/main/xmlscript/source/xmldlg_imexp/exp_share.hxx
openoffice/trunk/main/xmlscript/source/xmldlg_imexp/imp_share.hxx
openoffice/trunk/main/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
openoffice/trunk/main/xmlscript/source/xmldlg_imexp/xmldlg_export.cxx
openoffice/trunk/main/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx
openoffice/trunk/main/xmlscript/source/xmldlg_imexp/xmldlg_import.cxx

Modified: openoffice/trunk/main/toolkit/source/helper/property.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/toolkit/source/helper/property.cxx?rev=1654744r1=1654743r2=1654744view=diff
==
--- openoffice/trunk/main/toolkit/source/helper/property.cxx (original)
+++ openoffice/trunk/main/toolkit/source/helper/property.cxx Mon Jan 26 
09:06:52 2015
@@ -217,7 +217,7 @@ ImplPropertyInfo* ImplGetPropertyInfos(
 DECL_PROP_2 ( AutoRepeat, AUTO_REPEAT,
sal_Bool,   BOUND, MAYBEDEFAULT ),
 DECL_PROP_2 ( RepeatDelay,REPEAT_DELAY,   
sal_Int32,  BOUND, MAYBEDEFAULT ),
 DECL_PROP_2 ( ScaleImage, SCALEIMAGE, 
bool,   BOUND, MAYBEDEFAULT ),
-DECL_PROP_2 ( ScaleMode,  IMAGE_SCALE_MODE,   
sal_Int16,  BOUND, MAYBEDEFAULT ),
+DECL_DEP_PROP_2 ( ScaleMode,  IMAGE_SCALE_MODE,   
sal_Int16,  BOUND, MAYBEDEFAULT ),
 DECL_DEP_PROP_3 ( ScrollValue,SCROLLVALUE,
sal_Int32,  BOUND, MAYBEDEFAULT, MAYBEVOID ),
 DECL_PROP_2 ( ScrollValueMax, SCROLLVALUE_MAX,
sal_Int32,  BOUND, MAYBEDEFAULT ),
 DECL_PROP_2 ( ScrollValueMin, SCROLLVALUE_MIN,
sal_Int32,  BOUND, MAYBEDEFAULT ),

Modified: openoffice/trunk/main/xmlscript/dtd/dialog.dtd
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlscript/dtd/dialog.dtd?rev=1654744r1=1654743r2=1654744view=diff
==
--- openoffice/trunk/main/xmlscript/dtd/dialog.dtd (original)
+++ openoffice/trunk/main/xmlscript/dtd/dialog.dtd Mon Jan 26 09:06:52 2015
@@ -247,6 +247,7 @@
 !ATTLIST dlg:img %default-attributes;
   dlg:src CDATA #IMPLIED
   dlg:scale-image %boolean; #IMPLIED
+  dlg:scale-mode (none|isotropic|anisotropic); #IMPLIED
   dlg:tabstop %boolean; #IMPLIED
   
 

Modified: openoffice/trunk/main/xmlscript/source/xmldlg_imexp/exp_share.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlscript/source/xmldlg_imexp/exp_share.hxx?rev=1654744r1=1654743r2=1654744view=diff
==
--- openoffice/trunk/main/xmlscript/source/xmldlg_imexp/exp_share.hxx (original)
+++ openoffice/trunk/main/xmlscript/source/xmldlg_imexp/exp_share.hxx Mon Jan 
26 09:06:52 2015
@@ -153,6 +153,8 @@ public:
 ::rtl::OUString const  rPropName, ::rtl::OUString const  rAttrName );
void readSelectionTypeAttr(
 ::rtl::OUString const  rPropName, ::rtl::OUString const  rAttrName );
+void readImageScaleModeAttr(
+::rtl::OUString const  rPropName, ::rtl::OUString const  rAttrName );
//
 inline void addBoolAttr(
 ::rtl::OUString const  rAttrName, sal_Bool bValue )

Modified: openoffice/trunk/main/xmlscript/source/xmldlg_imexp/imp_share.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/xmlscript/source/xmldlg_imexp/imp_share.hxx?rev=1654744r1=1654743r2=1654744view=diff
==
--- openoffice/trunk/main/xmlscript/source/xmldlg_imexp/imp_share.hxx (original)
+++ openoffice/trunk/main/xmlscript/source/xmldlg_imexp/imp_share.hxx Mon Jan 
26 09:06:52 2015
@@ -447,6 +447,9 @@ public:
bool importSelectionTypeProperty(
 ::rtl::OUString const  rPropName, ::rtl::OUString const  rAttrName,
 css::uno::Referencecss::xml::input::XAttributes const  xAttributes 
);
+bool importImageScaleModeProperty(
+::rtl::OUString const  rPropName, ::rtl::OUString const  rAttrName,
+css::uno::Referencecss::xml::input::XAttributes const  xAttributes 
);
 };
 
 
//==

Modified: 
openoffice/trunk/main/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk

svn commit: r1654635 - /openoffice/trunk/main/helpcontent2/source/text/swriter/guide/header_with_chapter.xhp

[hanya]

Author: hanya
Date: Sun Jan 25 09:56:23 2015
New Revision: 1654635

URL: http://svn.apache.org/r1654635
Log:
#i125985# character b lacked from word box, Comment 4

Modified:

openoffice/trunk/main/helpcontent2/source/text/swriter/guide/header_with_chapter.xhp

Modified: 
openoffice/trunk/main/helpcontent2/source/text/swriter/guide/header_with_chapter.xhp
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/swriter/guide/header_with_chapter.xhp?rev=1654635r1=1654634r2=1654635view=diff
==
--- 
openoffice/trunk/main/helpcontent2/source/text/swriter/guide/header_with_chapter.xhp
 (original)
+++ 
openoffice/trunk/main/helpcontent2/source/text/swriter/guide/header_with_chapter.xhp
 Sun Jan 25 09:56:23 2015
@@ -48,7 +48,7 @@
 paragraph xml-lang=en-US id=par_id3155874 role=listitem 
l10n=U oldref=24Choose emphTools - Outline Numbering/emph./paragraph
  /listitem
  listitem
-paragraph xml-lang=en-US id=par_id3155898 role=listitem 
l10n=U oldref=25In the item type=menuitemStyle/item ox, select the 
paragraph style that you want to use for chapter titles, for example, Heading 
1./paragraph
+paragraph xml-lang=en-US id=par_id3155898 role=listitem 
l10n=U oldref=25In the item type=menuitemStyle/item box, select the 
paragraph style that you want to use for chapter titles, for example, Heading 
1./paragraph
  /listitem
  listitem
 paragraph xml-lang=en-US id=par_id3147124 role=listitem 
l10n=U oldref=26Select the numbering style for the chapter titles in the 
item type=menuitemNumber/item box, for example, 1,2,3/paragraph

svn commit: r1654634 - /openoffice/trunk/main/helpcontent2/source/text/swriter/01/04120221.xhp

[hanya]

Author: hanya
Date: Sun Jan 25 09:53:15 2015
New Revision: 1654634

URL: http://svn.apache.org/r1654634
Log:
#i125985# wrong description about All button on index dialog, Comment 3

Modified:
openoffice/trunk/main/helpcontent2/source/text/swriter/01/04120221.xhp

Modified: openoffice/trunk/main/helpcontent2/source/text/swriter/01/04120221.xhp
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/swriter/01/04120221.xhp?rev=1654634r1=1654633r2=1654634view=diff
==
--- openoffice/trunk/main/helpcontent2/source/text/swriter/01/04120221.xhp 
(original)
+++ openoffice/trunk/main/helpcontent2/source/text/swriter/01/04120221.xhp Sun 
Jan 25 09:53:15 2015
@@ -83,7 +83,7 @@
 bookmark xml-lang=en-US 
branch=hid/sw:PushButton:TP_TOX_ENTRY:PB_HYPERLINK id=bm_id3147224 
localize=false/paragraph role=heading id=hd_id3147212 xml-lang=en-US 
level=3 l10n=U oldref=19 Hyperlink (LS and LE)/paragraph
 paragraph role=paragraph id=par_id3153631 xml-lang=en-US l10n=CHG 
oldref=20ahelp hid=SW:PUSHBUTTON:TP_TOX_ENTRY:PB_HYPERLINKCreates a 
hyperlink for the part of the entry that you enclose by the opening (LS) and 
the closing (LE) hyperlink tags. On the emphStructure /emphline, click in 
the empty box in front of the part that you want to create a hyperlink for, and 
then click this button. Click in the empty box after the part that you want to 
hyperlink, and then click this button again. All hyperlinks must be unique. 
Available only for a table of contents./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/sw:PushButton:TP_TOX_ENTRY:PB_ALL_LEVELS id=bm_id3152778 
localize=false/paragraph role=heading id=hd_id3152766 xml-lang=en-US 
level=3 l10n=U oldref=36All/paragraph
-paragraph role=paragraph id=par_id3155137 xml-lang=en-US l10n=CHG 
oldref=37ahelp hid=SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ALL_LEVELSApplies the 
current settings without closing the dialog./ahelp/paragraph
+paragraph role=paragraph id=par_id3155137 xml-lang=en-US l10n=CHG 
oldref=37ahelp hid=SW:PUSHBUTTON:TP_TOX_ENTRY:PB_ALL_LEVELSApplies the 
current settings to all levels./ahelp/paragraph
 section id=aufbau2
 bookmark xml-lang=en-US branch=hid/sw:ListBox:TP_TOX_ENTRY:LB_CHARSTYLE 
id=bm_id3156270 localize=false/paragraph role=heading id=hd_id3153355 
xml-lang=en-US level=3 l10n=U oldref=21Character Style/paragraph
 paragraph role=paragraph id=par_id3156277 xml-lang=en-US l10n=U 
oldref=22ahelp hid=SW:LISTBOX:TP_TOX_ENTRY:LB_CHARSTYLESpecify the 
formatting style for the selected part on the emphStructure 
line/emph./ahelp/paragraph

svn commit: r1653973 - /openoffice/trunk/main/sc/source/core/data/table6.cxx

[hanya]

Author: hanya
Date: Thu Jan 22 17:53:09 2015
New Revision: 1653973

URL: http://svn.apache.org/r1653973
Log:
#i107619# update search result while repeating search

Modified:
openoffice/trunk/main/sc/source/core/data/table6.cxx

Modified: openoffice/trunk/main/sc/source/core/data/table6.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/table6.cxx?rev=1653973r1=1653972r2=1653973view=diff
==
--- openoffice/trunk/main/sc/source/core/data/table6.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/table6.cxx Thu Jan 22 17:53:09 
2015
@@ -194,13 +194,13 @@ sal_Bool ScTable::SearchCell(const SvxSe
else if (bDoBack)
{
xub_StrLen nTemp=nStart; 
nStart=nEnd; nEnd=nTemp;
-   bRepeat = 
((sal_Bool)(pSearchText-SearchBkwrd(aString, nStart, nEnd)));
+   bRepeat = 
((sal_Bool)(pSearchText-SearchBkwrd(aString, nStart, nEnd, aSearchResult)));
// change results to definition 
before 614:
--nEnd;
}
else
{
-   bRepeat = 
((sal_Bool)(pSearchText-SearchFrwrd(aString, nStart, nEnd)));
+   bRepeat = 
((sal_Bool)(pSearchText-SearchFrwrd(aString, nStart, nEnd, aSearchResult)));
// change results to definition 
before 614:
--nEnd;
}

svn commit: r1653052 - /openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

[hanya]

Author: hanya
Date: Mon Jan 19 17:10:34 2015
New Revision: 1653052

URL: http://svn.apache.org/r1653052
Log:
#i28353# add leading dots for a label Floating Frame

Modified:

openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

Modified: 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu?rev=1653052r1=1653051r2=1653052view=diff
==
--- 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
 (original)
+++ 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
 Mon Jan 19 17:10:34 2015
@@ -3311,7 +3311,7 @@
 /node
 node oor:name=.uno:InsertObjectFloatingFrame oor:op=replace
 prop oor:name=Label oor:type=xs:string
-value xml:lang=en-USFloat~ing Frame/value
+value xml:lang=en-USFloat~ing Frame.../value
 /prop
 prop oor:name=Properties oor:type=xs:int
 value1/value

svn commit: r1653053 - /openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

[hanya]

Author: hanya
Date: Mon Jan 19 17:12:22 2015
New Revision: 1653053

URL: http://svn.apache.org/r1653053
Log:
#i116863# remove the extra space before colon in the label for date number 
format

Modified:

openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu

Modified: 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu?rev=1653053r1=1653052r2=1653053view=diff
==
--- 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
 (original)
+++ 
openoffice/trunk/main/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
 Mon Jan 19 17:12:22 2015
@@ -3813,7 +3813,7 @@
 /node
 node oor:name=.uno:NumberFormatDate oor:op=replace
 prop oor:name=Label oor:type=xs:string
-value xml:lang=en-USNumber Format : Date/value
+value xml:lang=en-USNumber Format: Date/value
 /prop
 prop oor:name=Properties oor:type=xs:int
 value1/value

svn commit: r1652460 - /openoffice/trunk/main/offapi/com/sun/star/util/XProtectable.idl

[hanya]

Author: hanya
Date: Fri Jan 16 17:02:52 2015
New Revision: 1652460

URL: http://svn.apache.org/r1652460
Log:
#i34459# add description about IllegalArgumentException thrown by unprotect 
method and about some arguments

Modified:
openoffice/trunk/main/offapi/com/sun/star/util/XProtectable.idl

Modified: openoffice/trunk/main/offapi/com/sun/star/util/XProtectable.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/util/XProtectable.idl?rev=1652460r1=1652459r2=1652460view=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/util/XProtectable.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/util/XProtectable.idl Fri Jan 16 
17:02:52 2015
@@ -44,11 +44,19 @@ published interface XProtectable: com::s
 { 

//- 
/** activates the protection.
+   
+   @param aPassword
+   a string to specify new password.
 */
void protect( [in] string aPassword ); 
  

//- 
/** removes the protection.
+   
+   @param aPassword
+   a string to match with the current password.
+   @throws com::sun::star::lang::IllegalArgumentException
+   if invalid password is specified.
 */
void unprotect( [in] string aPassword ) 
raises( com::sun::star::lang::IllegalArgumentException 
); 

svn commit: r1652207 - /openoffice/trunk/main/sc/source/ui/docshell/externalrefmgr.cxx

[hanya]

Author: hanya
Date: Thu Jan 15 18:14:41 2015
New Revision: 1652207

URL: http://svn.apache.org/r1652207
Log:
#i117843# avoid shrinking the range from external file until the matrix 
supports gap from the original range

Modified:
openoffice/trunk/main/sc/source/ui/docshell/externalrefmgr.cxx

Modified: openoffice/trunk/main/sc/source/ui/docshell/externalrefmgr.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/docshell/externalrefmgr.cxx?rev=1652207r1=1652206r2=1652207view=diff
==
--- openoffice/trunk/main/sc/source/ui/docshell/externalrefmgr.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/docshell/externalrefmgr.cxx Thu Jan 15 
18:14:41 2015
@@ -1369,10 +1369,11 @@ static ScTokenArray* lcl_convertToTokenA
 // Only loop within the data area.
 SCCOL nDataCol1 = nCol1, nDataCol2 = nCol2;
 SCROW nDataRow1 = nRow1, nDataRow2 = nRow2;
-bool bShrunk;
-if (!pSrcDoc-ShrinkToUsedDataArea( bShrunk, nTab, nDataCol1, 
nDataRow1, nDataCol2, nDataRow2, false))
+// the matrix for shrunken data range gives invalid match until the 
matrix supports the gap
+//bool bShrunk;
+//if (!pSrcDoc-ShrinkToUsedDataArea( bShrunk, nTab, nDataCol1, 
nDataRow1, nDataCol2, nDataRow2, false))
 // no data within specified range.
-continue;
+//continue;
 
 if (pUsedRange.get())
 // Make sure the used area only grows, not shrinks.

svn commit: r1651700 - /openoffice/trunk/main/offapi/com/sun/star/sheet/SheetCell.idl

[hanya]

Author: hanya
Date: Wed Jan 14 15:17:21 2015
New Revision: 1651700

URL: http://svn.apache.org/r1651700
Log:
#i20542# add description about getTextFieldMasters returns always void on this 
service

Modified:
openoffice/trunk/main/offapi/com/sun/star/sheet/SheetCell.idl

Modified: openoffice/trunk/main/offapi/com/sun/star/sheet/SheetCell.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/sheet/SheetCell.idl?rev=1651700r1=1651699r2=1651700view=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/sheet/SheetCell.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/sheet/SheetCell.idl Wed Jan 14 
15:17:21 2015
@@ -226,6 +226,9 @@ published service SheetCell

//-
 
/** provides access to the text fields used in this cell.
+
+pmember 
scope=com::sun::star::textXTextFieldsSupplier::getTextFieldMasters/member 
+returns always void/ since the field master is not supported./p
 */
interface com::sun::star::text::XTextFieldsSupplier;
 

svn commit: r1651680 - /openoffice/trunk/main/offapi/com/sun/star/util/XNumberFormats.idl

[hanya]

Author: hanya
Date: Wed Jan 14 14:27:43 2015
New Revision: 1651680

URL: http://svn.apache.org/r1651680
Log:
#i53565# add descriptions about parameters of member methods

Modified:
openoffice/trunk/main/offapi/com/sun/star/util/XNumberFormats.idl

Modified: openoffice/trunk/main/offapi/com/sun/star/util/XNumberFormats.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/util/XNumberFormats.idl?rev=1651680r1=1651679r2=1651680view=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/util/XNumberFormats.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/util/XNumberFormats.idl Wed Jan 
14 14:27:43 2015
@@ -47,6 +47,8 @@
 
//= 
  
 /** provides access to multiple typeNumberFormat/types.
+
+The number formats are managed by their unique key in the document.
  */
 published interface XNumberFormats: com::sun::star::uno::XInterface
 { 
@@ -54,6 +56,9 @@ published interface XNumberFormats: com:
 
/** @returns  
a readonly 
typeNumberFormatProperties/type.
+   
+   @param nKey
+   the key for the format
 */
com::sun::star::beans::XPropertySet getByKey( [in] long nKey ); 
  
@@ -66,8 +71,8 @@ published interface XNumberFormats: com:
the type of number formats to 
return. Must be one of the 
typeNumberFormat/type 
constants. 
 
-   @param  nLanguage 
-   the language of number formats 
to return. 
+   @param  nLocale 
+   the locale of number formats to 
return. 
 
@param  bCreate 
TRUE/: create new entries if 
no formats for the selected language existBR 
@@ -80,6 +85,18 @@ published interface XNumberFormats: com:

//- 
 
/** finds a number format by its format string and returns its key.
+   
+   @returns
+   the key for the format if found, otherwise -1.
+   
+   @param aFormat
+   the string representation of the number format
+   
+   @param nLocale
+   the locale for number formats to find
+   
+   @param bScan
+   reserved for future use and should be set to false
 */
long queryKey( [in] string aFormat, 
 [in] com::sun::star::lang::Locale nLocale, 
@@ -88,6 +105,18 @@ published interface XNumberFormats: com:

//- 
 
/** adds a new number format to the list, using a format string.
+   
+   @returns
+   the key for new number format
+   
+   @param aFormat
+   the string representation of the number format
+   
+   @param nLocale
+   the locale for the number format
+   
+   @throws com::sun::star::util::MalformedNumberFormatException
+   if incorrect number format is specified
 */
long addNew( [in] string aFormat, 
 [in] com::sun::star::lang::Locale nLocale ) 
@@ -98,6 +127,21 @@ published interface XNumberFormats: com:
/** adds a new number format to the list, using a format 
string in a different locale than the desired locale of the 
resulting number format.
+   
+   @returns
+   the key for added number format
+   
+   @param aFormat
+   the key for the number format
+   
+   @param nLocale
+   the original locale for the number format
+   
+   @param nNewLocale
+   the new locale for the number format to be converted
+   
+   @throws com::sun::star::util::MalformedNumberFormatException
+   if incorrect number format is specified
 */
long addNewConverted( [in] string aFormat, 
 [in] com::sun::star::lang::Locale nLocale, 
@@ -107,6 +151,9 @@ published interface XNumberFormats: com:

//- 
 
/** removes a number format from the list.
+   
+   @param nKey

svn commit: r1651591 - /openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx

[hanya]

Author: hanya
Date: Wed Jan 14 08:20:05 2015
New Revision: 1651591

URL: http://svn.apache.org/r1651591
Log:
#i125991# catch IndexOutOfBoundsException to avoid fatal error happen when 
input method is used on Gtk environment

Modified:
openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx

Modified: openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx?rev=1651591r1=1651590r2=1651591view=diff
==
--- openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx (original)
+++ openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx Wed Jan 14 08:20:05 
2015
@@ -3749,18 +3749,26 @@ uno::Referenceaccessibility::XAccessibl
return 
uno::Referenceaccessibility::XAccessibleEditableText(xContext, 
uno::UNO_QUERY);
}
 
-   for (sal_Int32 i = 0; i  xContext-getAccessibleChildCount(); ++i)
-   {
-   uno::Reference accessibility::XAccessible  xChild = 
xContext-getAccessibleChild(i);
-   if (!xChild.is())
-   continue;
-   uno::Reference accessibility::XAccessibleContext  
xChildContext = xChild-getAccessibleContext();
-   if (!xChildContext.is())
-   continue;
-   uno::Reference accessibility::XAccessibleEditableText  xText 
= FindFocus(xChildContext);
-   if (xText.is())
-   return xText;
-   }
+try
+{
+for (sal_Int32 i = 0, n = xContext-getAccessibleChildCount(); i  n; 
++i)
+{
+uno::Reference accessibility::XAccessible  xChild = 
xContext-getAccessibleChild(i);
+if (!xChild.is())
+continue;
+uno::Reference accessibility::XAccessibleContext  
xChildContext = xChild-getAccessibleContext();
+if (!xChildContext.is())
+continue;
+uno::Reference accessibility::XAccessibleEditableText  xText = 
FindFocus(xChildContext);
+if (xText.is())
+return xText;
+}
+}
+catch( lang::IndexOutOfBoundsException  e )
+{
+OSL_TRACE( GtkFrame FindFocus, %s, ::rtl::OUStringToOString(
+e.Message, RTL_TEXTENCODING_UTF8 ).pData-buffer );
+}
return uno::Reference accessibility::XAccessibleEditableText ();
 }
 

svn commit: r1651106 - /openoffice/trunk/main/basctl/source/basicide/baside2b.cxx

[hanya]

Author: hanya
Date: Mon Jan 12 14:39:39 2015
New Revision: 1651106

URL: http://svn.apache.org/r1651106
Log:
#i120772# do not ignore last three properties when special properties not found 
in watching window

Modified:
openoffice/trunk/main/basctl/source/basicide/baside2b.cxx

Modified: openoffice/trunk/main/basctl/source/basicide/baside2b.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/baside2b.cxx?rev=1651106r1=1651105r2=1651106view=diff
==
--- openoffice/trunk/main/basctl/source/basicide/baside2b.cxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/baside2b.cxx Mon Jan 12 
14:39:39 2015
@@ -1829,9 +1829,16 @@ void WatchTreeListBox::RequestingChilds(
createAllObjectProperties( pObj );
SbxArray* pProps = pObj-GetProperties();
sal_uInt16 nPropCount = pProps-Count();
+   if ( nPropCount = 3  
+pProps-Get( nPropCount -1 
)-GetName().EqualsIgnoreCaseAscii( Dbg_Methods ) 
+pProps-Get( nPropCount -2 
)-GetName().EqualsIgnoreCaseAscii( Dbg_Properties ) 
+pProps-Get( nPropCount -3 
)-GetName().EqualsIgnoreCaseAscii( Dbg_SupportedInterfaces ) )
+{
+   nPropCount -= 3;
+}
pItem-maMemberList.allocList( nPropCount );
 
-   for( sal_uInt16 i = 0 ; i  nPropCount - 3 ; i++ )
+   for( sal_uInt16 i = 0 ; i  nPropCount ; ++i )
{
SbxVariable* pVar = pProps-Get( i );
 

svn commit: r1650862 - /openoffice/trunk/main/basic/source/runtime/methods.cxx

[hanya]

Author: hanya
Date: Sun Jan 11 02:53:26 2015
New Revision: 1650862

URL: http://svn.apache.org/r1650862
Log:
#i94895# revert the part of revision 1650261, replaced string should be 
starting with the start postion if specified

Modified:
openoffice/trunk/main/basic/source/runtime/methods.cxx

Modified: openoffice/trunk/main/basic/source/runtime/methods.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/runtime/methods.cxx?rev=1650862r1=1650861r2=1650862view=diff
==
--- openoffice/trunk/main/basic/source/runtime/methods.cxx (original)
+++ openoffice/trunk/main/basic/source/runtime/methods.cxx Sun Jan 11 02:53:26 
2015
@@ -1448,7 +1448,7 @@ RTLFUNC(Replace)
}
}
}
-   rPar.Get(0)-PutString( aExpStr.Copy() );
+   rPar.Get(0)-PutString( aExpStr.Copy( 
static_castsal_uInt16(lStartPos - 1) )  );
}
 }
 

svn commit: r1650261 - /openoffice/trunk/main/basic/source/runtime/methods.cxx

[hanya]

Author: hanya
Date: Thu Jan  8 12:56:45 2015
New Revision: 1650261

URL: http://svn.apache.org/r1650261
Log:
#i94895# fix illegal result of Replace runtime function

Modified:
openoffice/trunk/main/basic/source/runtime/methods.cxx

Modified: openoffice/trunk/main/basic/source/runtime/methods.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/runtime/methods.cxx?rev=1650261r1=1650260r2=1650261view=diff
==
--- openoffice/trunk/main/basic/source/runtime/methods.cxx (original)
+++ openoffice/trunk/main/basic/source/runtime/methods.cxx Thu Jan  8 12:56:45 
2015
@@ -1439,7 +1439,7 @@ RTLFUNC(Replace)
if( nPos != STRING_NOTFOUND )
{
aExpStr.Replace( nPos, nFindStrLen, 
aReplaceStr );
-   nPos = nPos - nFindStrLen + 
nReplaceStrLen + 1;
+   nPos = nPos + nReplaceStrLen;
nCounts++;
}
else
@@ -1448,7 +1448,7 @@ RTLFUNC(Replace)
}
}
}
-   rPar.Get(0)-PutString( aExpStr.Copy( 
static_castsal_uInt16(lStartPos - 1) )  );
+   rPar.Get(0)-PutString( aExpStr.Copy() );
}
 }
 

svn commit: r1650325 - in /openoffice/trunk/main/basic: inc/basic/sbxmeth.hxx inc/basic/sbxobj.hxx source/comp/parser.cxx source/runtime/stdobj.cxx source/sbx/sbxobj.cxx

[hanya]

Author: hanya
Date: Thu Jan  8 16:28:11 2015
New Revision: 1650325

URL: http://svn.apache.org/r1650325
Log:
#i63614# fix strange type missmatch when Iif runtime function is used

Second or later compilation uses value type returned by previous execution of 
code. 
Use the defined type as return value of the runtime function of Basic always. 

Modified:
openoffice/trunk/main/basic/inc/basic/sbxmeth.hxx
openoffice/trunk/main/basic/inc/basic/sbxobj.hxx
openoffice/trunk/main/basic/source/comp/parser.cxx
openoffice/trunk/main/basic/source/runtime/stdobj.cxx
openoffice/trunk/main/basic/source/sbx/sbxobj.cxx

Modified: openoffice/trunk/main/basic/inc/basic/sbxmeth.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/inc/basic/sbxmeth.hxx?rev=1650325r1=1650324r2=1650325view=diff
==
--- openoffice/trunk/main/basic/inc/basic/sbxmeth.hxx (original)
+++ openoffice/trunk/main/basic/inc/basic/sbxmeth.hxx Thu Jan  8 16:28:11 2015
@@ -31,17 +31,22 @@ class SbxMethodImpl;
 class SbxMethod : public SbxVariable
 {
SbxMethodImpl* mpSbxMethodImpl; // Impl data
+   bool   mbIsRuntimeFunction;
+   SbxDataTypembRuntimeFunctionReturnType;
 
 public:
SBX_DECL_PERSIST_NODATA(SBXCR_SBX,SBXID_METHOD,1);
TYPEINFO();
-   SbxMethod( const String r, SbxDataType t )
-   : SbxVariable( t ) { SetName( r ); }
-   SbxMethod( const SbxMethod r ) : SvRefBase( r ), SbxVariable( r ) {}
+   SbxMethod( const String r, SbxDataType t, bool 
bIsRuntimeFunction=false )
+   : SbxVariable( t ), mbIsRuntimeFunction( bIsRuntimeFunction ), 
mbRuntimeFunctionReturnType( t ) { SetName( r ); }
+   SbxMethod( const SbxMethod r )
+   : SvRefBase( r ), SbxVariable( r ), mbIsRuntimeFunction( 
r.IsRuntimeFunction() ) {}
SbxMethod operator=( const SbxMethod r )
{ SbxVariable::operator=( r ); return *this; }
sal_Bool Run( SbxValues* pValues = NULL );
virtual SbxClassType GetClass() const;
+   bool IsRuntimeFunction() const { return mbIsRuntimeFunction; }
+   SbxDataType GetRuntimeFunctionReturnType() const{ return 
mbRuntimeFunctionReturnType; }
 };
 
 #ifndef __SBX_SBXMETHODREF_HXX

Modified: openoffice/trunk/main/basic/inc/basic/sbxobj.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/inc/basic/sbxobj.hxx?rev=1650325r1=1650324r2=1650325view=diff
==
--- openoffice/trunk/main/basic/inc/basic/sbxobj.hxx (original)
+++ openoffice/trunk/main/basic/inc/basic/sbxobj.hxx Thu Jan  8 16:28:11 2015
@@ -80,7 +80,7 @@ public:
SbxVariable* Execute( const String );
// Manage elements
virtual sal_Bool GetAll( SbxClassType ) { return sal_True; }
-   SbxVariable* Make( const String, SbxClassType, SbxDataType );
+   SbxVariable* Make( const String, SbxClassType, SbxDataType, bool 
bIsRuntimeFunction = false );
virtual SbxObject* MakeObject( const String, const String );
virtual void Insert( SbxVariable* );
// AB 23.4.1997, Optimization, Insertion without check for duplicate 
Entries and 

Modified: openoffice/trunk/main/basic/source/comp/parser.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/comp/parser.cxx?rev=1650325r1=1650324r2=1650325view=diff
==
--- openoffice/trunk/main/basic/source/comp/parser.cxx (original)
+++ openoffice/trunk/main/basic/source/comp/parser.cxx Thu Jan  8 16:28:11 2015
@@ -169,7 +169,15 @@ SbiSymDef* SbiParser::CheckRTLForSym( co
if( pVar-IsA( TYPE(SbxMethod) ) )
{
SbiProcDef* pProc_ = aRtlSyms.AddProc( rSym );
-   pProc_-SetType( pVar-GetType() );
+   SbxMethod* pMethod = (SbxMethod*) pVar;
+   if ( pMethod  pMethod-IsRuntimeFunction() )
+   {
+   pProc_-SetType( 
pMethod-GetRuntimeFunctionReturnType() );
+   }
+   else
+   {
+   pProc_-SetType( pVar-GetType() );
+   }
pDef = pProc_;
}
else

Modified: openoffice/trunk/main/basic/source/runtime/stdobj.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basic/source/runtime/stdobj.cxx?rev=1650325r1=1650324r2=1650325view=diff
==
--- openoffice/trunk/main/basic/source/runtime/stdobj.cxx (original)
+++ openoffice/trunk/main/basic/source/runtime/stdobj.cxx Thu Jan  8 16:28:11 
2015
@@ -715,7 +715,7 @@ SbxVariable* SbiStdObject::Find( const S
eCT = SbxCLASS_PROPERTY;
else if( nType  _METHOD

svn commit: r1595774 - /openoffice/trunk/main/helpcontent2/source/text/shared/01/01020000.xhp

[hanya]

Author: hanya
Date: Mon May 19 07:43:14 2014
New Revision: 1595774

URL: http://svn.apache.org/r1595774
Log:
#i123114# unrenamed help id from sfx2 for file picker

Modified:
openoffice/trunk/main/helpcontent2/source/text/shared/01/0102.xhp

Modified: openoffice/trunk/main/helpcontent2/source/text/shared/01/0102.xhp
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/shared/01/0102.xhp?rev=1595774r1=1595773r2=1595774view=diff
==
--- openoffice/trunk/main/helpcontent2/source/text/shared/01/0102.xhp 
(original)
+++ openoffice/trunk/main/helpcontent2/source/text/shared/01/0102.xhp Mon 
May 19 07:43:14 2014
@@ -76,7 +76,7 @@
  oldref=38Default Directory/paragraph
   paragraph xml-lang=en-US id=par_id3109847 role=paragraph l10n=U 
oldref=39ahelp 
hid=SVTOOLS_PUSHBUTTON_DLG_SVT_EXPLORERFILE_BTN_EXPLORERFILE_STANDARDDisplays
 the files in the default user directory./ahelp/paragraph
   embed href=text/shared/00/0004.xhp#systandardverzeichnis2/
-bookmark xml-lang=en-US branch=hid/SFX2_HID_FILEDLG_STANDARD 
id=bm_id3150355 localize=false/
+bookmark xml-lang=en-US branch=hid/SVT_HID_FILEDLG_STANDARD 
id=bm_id3150355 localize=false/
 paragraph xml-lang=en-US id=hd_id3148538 role=heading level=2 l10n=U
  oldref=19Display area/paragraph
   paragraph xml-lang=en-US id=par_id3156113 role=paragraph l10n=U 
oldref=20ahelp hid=HID_FILEDLG_STANDARDDisplays the files and 
directories in the directory that you are in./ahelp To open a file, select 
the file, and then click emphOpen/emph./paragraph

svn commit: r1595628 - /openoffice/trunk/main/sw/source/ui/misc/glossary.cxx

[hanya]

Author: hanya
Date: Sun May 18 14:51:45 2014
New Revision: 1595628

URL: http://svn.apache.org/r1595628
Log:
#i124204# make fields emtpy on the auto text dialog when parent node is selected

Modified:
openoffice/trunk/main/sw/source/ui/misc/glossary.cxx

Modified: openoffice/trunk/main/sw/source/ui/misc/glossary.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/misc/glossary.cxx?rev=1595628r1=1595627r2=1595628view=diff
==
--- openoffice/trunk/main/sw/source/ui/misc/glossary.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/misc/glossary.cxx Sun May 18 14:51:45 
2014
@@ -349,7 +349,12 @@ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvT
ShowAutoText(*::GetCurrGlosGroup(), aShortNameEdit.GetText());
}
else
+   {
+   aNameED.SetText(aEmptyStr);
+   aShortNameEdit.SetText(aEmptyStr);
+   aInsertBtn.Enable(sal_False);
ShowAutoText(aEmptyStr, aEmptyStr);
+   }
//Controls aktualisieren
NameModify(aShortNameEdit);
 if( SfxRequest::HasMacroRecorder( pSh-GetView().GetViewFrame() ) )

svn commit: r1595429 - /openoffice/trunk/main/cui/source/tabpages/page.cxx

[hanya]

Author: hanya
Date: Sat May 17 07:06:55 2014
New Revision: 1595429

URL: http://svn.apache.org/r1595429
Log:
#i53447# update example view for Draw during the activation of the tab page

Modified:
openoffice/trunk/main/cui/source/tabpages/page.cxx

Modified: openoffice/trunk/main/cui/source/tabpages/page.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/page.cxx?rev=1595429r1=1595428r2=1595429view=diff
==
--- openoffice/trunk/main/cui/source/tabpages/page.cxx (original)
+++ openoffice/trunk/main/cui/source/tabpages/page.cxx Sat May 17 07:06:55 2014
@@ -1458,6 +1458,7 @@ void SvxPageDescPage::InitHeadFoot_Impl(
 void SvxPageDescPage::ActivatePage( const SfxItemSet rSet )
 {
InitHeadFoot_Impl( rSet );
+   UpdateExample_Impl();
ResetBackground_Impl( rSet );
RangeHdl_Impl( 0 );
 }

svn commit: r1595437 - in /openoffice/trunk/main/basctl/source/basicide: objdlg.cxx objdlg.hxx

[hanya]

Author: hanya
Date: Sat May 17 09:39:39 2014
New Revision: 1595437

URL: http://svn.apache.org/r1595437
Log:
#i76558# jump by Enter key on the Object catalog

Modified:
openoffice/trunk/main/basctl/source/basicide/objdlg.cxx
openoffice/trunk/main/basctl/source/basicide/objdlg.hxx

Modified: openoffice/trunk/main/basctl/source/basicide/objdlg.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/objdlg.cxx?rev=1595437r1=1595436r2=1595437view=diff
==
--- openoffice/trunk/main/basctl/source/basicide/objdlg.cxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/objdlg.cxx Sat May 17 09:39:39 
2014
@@ -64,26 +64,41 @@ void ObjectTreeListBox::MouseButtonDown(
 {
BasicTreeListBox::MouseButtonDown( rMEvt );
 
-   if ( rMEvt.IsLeft()  ( rMEvt.GetClicks() == 2 ) )
-   {
-BasicEntryDescriptor aDesc( GetEntryDescriptor( GetCurEntry() ) );
+if ( rMEvt.IsLeft()  ( rMEvt.GetClicks() == 2 ) )
+{
+OpenCurrent();
+}
+}
 
-   if ( aDesc.GetType() == OBJ_TYPE_METHOD )
-   {
-BasicIDEShell* pIDEShell = IDE_DLL()-GetShell();
-SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell-GetViewFrame() : 
NULL;
-   SfxDispatcher* pDispatcher = pViewFrame ? 
pViewFrame-GetDispatcher() : NULL;
-if( pDispatcher )
-   {
-SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), 
aDesc.GetLibName(), aDesc.GetName(), 
-  aDesc.GetMethodName(), ConvertType( 
aDesc.GetType() ) );
-   pDispatcher-Execute( SID_BASICIDE_SHOWSBX,
-   
SFX_CALLMODE_SYNCHRON, aSbxItem, 0L );
-   }
-   }
-   }
+void ObjectTreeListBox::KeyInput( const KeyEvent rEvt )
+{
+if ( rEvt.GetKeyCode() == KEY_RETURN  OpenCurrent() )
+{
+return;
+}
+BasicTreeListBox::KeyInput( rEvt );
 }
 
+bool ObjectTreeListBox::OpenCurrent()
+{
+BasicEntryDescriptor aDesc( GetEntryDescriptor( GetCurEntry() ) );
+
+if ( aDesc.GetType() == OBJ_TYPE_METHOD )
+{
+BasicIDEShell* pIDEShell = IDE_DLL()-GetShell();
+SfxViewFrame* pViewFrame = pIDEShell ? pIDEShell-GetViewFrame() : 
NULL;
+SfxDispatcher* pDispatcher = pViewFrame ? pViewFrame-GetDispatcher() 
: NULL;
+if( pDispatcher )
+{
+SbxItem aSbxItem( SID_BASICIDE_ARG_SBX, aDesc.GetDocument(), 
aDesc.GetLibName(), aDesc.GetName(), 
+  aDesc.GetMethodName(), ConvertType( 
aDesc.GetType() ) );
+pDispatcher-Execute( SID_BASICIDE_SHOWSBX,
+SFX_CALLMODE_SYNCHRON, aSbxItem, 0L );
+return true;
+}
+}
+return false;
+}
 
 
 ObjectCatalog::ObjectCatalog( Window * pParent )

Modified: openoffice/trunk/main/basctl/source/basicide/objdlg.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/objdlg.hxx?rev=1595437r1=1595436r2=1595437view=diff
==
--- openoffice/trunk/main/basctl/source/basicide/objdlg.hxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/objdlg.hxx Sat May 17 09:39:39 
2014
@@ -40,7 +40,9 @@ private:
 
virtual voidCommand( const CommandEvent rCEvt );
virtual voidMouseButtonDown( const MouseEvent rMEvt );
+   virtual voidKeyInput( const KeyEvent rEvt );
 
+   boolOpenCurrent();
 public:
ObjectTreeListBox( Window* pParent, const ResId rRes );
~ObjectTreeListBox();

svn commit: r1595439 - /openoffice/trunk/main/scripting/source/protocolhandler/scripthandler.cxx

[hanya]

Author: hanya
Date: Sat May 17 10:16:40 2014
New Revision: 1595439

URL: http://svn.apache.org/r1595439
Log:
#i113481# query script invocation from the current frame when the controller is 
not yet attached

Modified:
openoffice/trunk/main/scripting/source/protocolhandler/scripthandler.cxx

Modified: 
openoffice/trunk/main/scripting/source/protocolhandler/scripthandler.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/scripting/source/protocolhandler/scripthandler.cxx?rev=1595439r1=1595438r2=1595439view=diff
==
--- openoffice/trunk/main/scripting/source/protocolhandler/scripthandler.cxx 
(original)
+++ openoffice/trunk/main/scripting/source/protocolhandler/scripthandler.cxx 
Sat May 17 10:16:40 2014
@@ -170,7 +170,28 @@ void SAL_CALL ScriptProtocolHandler::dis
 
 OSL_ENSURE( xDocumentScripts.is(), 
ScriptProtocolHandler::dispatchWithNotification: can't do the security check! 
);
 if ( !xDocumentScripts.is() || 
!xDocumentScripts-getAllowMacroExecution() )
+{
+if ( xListener.is() )
+{
+::com::sun::star::frame::DispatchResultEvent aEvent(
+static_cast ::cppu::OWeakObject* ( this ), 
+
::com::sun::star::frame::DispatchResultState::FAILURE, 
+invokeResult );
+try
+{
+xListener-dispatchFinished( aEvent ) ;
+}
+catch(RuntimeException  e)
+{
+OSL_TRACE( 
+
ScriptProtocolHandler::dispatchWithNotification: caught RuntimeException
+while dispatchFinished with failture of the 
execution %s,
+::rtl::OUStringToOString( e.Message,
+RTL_TEXTENCODING_ASCII_US ).pData-buffer );
+}
+}
 return;
+}
 }
 
 // Creates a ScriptProvider ( if one is not created already ) 
@@ -345,6 +366,25 @@ ScriptProtocolHandler::getScriptInvocati
 if ( !m_xScriptInvocation.set( xController-getModel(), UNO_QUERY 
) )
 m_xScriptInvocation.set( xController, UNO_QUERY );
 }
+else
+{
+Reference XFrame  xFrame( m_xFrame.get(), UNO_QUERY );
+if ( xFrame.is() )
+{
+SfxFrame* pFrame = NULL;
+for ( pFrame = SfxFrame::GetFirst(); pFrame; pFrame = 
SfxFrame::GetNext( *pFrame ) )
+{
+if ( pFrame-GetFrameInterface() == xFrame )
+break;
+}
+SfxObjectShell* pDocShell = pFrame ? 
pFrame-GetCurrentDocument() : SfxObjectShell::Current();
+if ( pDocShell )
+{
+Reference XModel  xModel( pDocShell-GetModel() );
+m_xScriptInvocation.set( xModel, UNO_QUERY );
+}
+}
+}
 }
 return m_xScriptInvocation.is();
 }

svn commit: r1595181 - in /openoffice/trunk/main: framework/inc/framework/ framework/source/classes/ framework/source/dispatch/ framework/source/fwe/classes/ framework/source/uielement/ sfx2/source/me

[hanya]

Author: hanya
Date: Fri May 16 12:48:54 2014
New Revision: 1595181

URL: http://svn.apache.org/r1595181
Log:
#i86528# use the module manager to identify the context for addons menu merging

Modified:
openoffice/trunk/main/framework/inc/framework/addonmenu.hxx
openoffice/trunk/main/framework/source/classes/menumanager.cxx
openoffice/trunk/main/framework/source/dispatch/menudispatcher.cxx
openoffice/trunk/main/framework/source/fwe/classes/addonmenu.cxx
openoffice/trunk/main/framework/source/uielement/menubarmanager.cxx
openoffice/trunk/main/sfx2/source/menu/virtmenu.cxx

Modified: openoffice/trunk/main/framework/inc/framework/addonmenu.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/inc/framework/addonmenu.hxx?rev=1595181r1=1595180r2=1595181view=diff
==
--- openoffice/trunk/main/framework/inc/framework/addonmenu.hxx (original)
+++ openoffice/trunk/main/framework/inc/framework/addonmenu.hxx Fri May 16 
12:48:54 2014
@@ -30,6 +30,7 @@
 #include com/sun/star/frame/XFrame.hpp
 #include com/sun/star/beans/PropertyValue.hpp
 #include com/sun/star/uno/Sequence.hxx
+#include com/sun/star/lang/XMultiServiceFactory.hpp
 
 
//_
 // includes of other projects
@@ -92,23 +93,25 @@ class FWE_DLLPUBLIC AddonMenuManager
 static sal_Bool   IsAddonMenuId( sal_uInt16 nId ) { return (( nId = 
ADDONMENU_ITEMID_START )  ( nId  ADDONMENU_ITEMID_END )); }
 
 // Check if the context string matches the provided xModel context
-static sal_Bool  IsCorrectContext( const 
::com::sun::star::uno::Reference ::com::sun::star::frame::XModel  rModel, 
const rtl::OUString aContext );
+static sal_Bool  IsCorrectContext( const ::rtl::OUString 
rModuleIdentifier, const rtl::OUString aContext );
 
 // Factory method to create different Add-On menu types
 static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const 
com::sun::star::uno::Reference com::sun::star::frame::XFrame  rFrame );
 
 // Create the Add-Ons menu
-static AddonMenu* CreateAddonMenu( const 
::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame  rFrame );
+static AddonMenu* CreateAddonMenu( const 
::com::sun::star::uno::Reference ::com::sun::star::frame::XFrame  rFrame, 
+   const 
::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory 
 rServiceManager );
 
// Merge the Add-Ons help menu items into the given menu bar at 
a defined pos
static void   MergeAddonHelpMenu( const 
com::sun::star::uno::Reference com::sun::star::frame::XFrame  rFrame,
-   
  MenuBar* pMergeMenuBar );
+   
  MenuBar* pMergeMenuBar, 
+  const 
::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory 
 rServiceManager );
 
// Merge the addon popup menus into the given menu bar at the 
provided pos.
static void   MergeAddonPopupMenus( const 
com::sun::star::uno::Reference com::sun::star::frame::XFrame  rFrame,
-   
const com::sun::star::uno::Reference com::sun::star::frame::XModel 
 rModel,

sal_uInt16   nMergeAtPos,
-   
MenuBar* pMergeMenuBar );
+   
MenuBar* pMergeMenuBar, 
+const 
::com::sun::star::uno::Reference ::com::sun::star::lang::XMultiServiceFactory 
 rServiceManager );
 
 // Returns the next position to insert a menu item/sub menu
 static sal_uInt16 GetNextPos( sal_uInt16 nPos );
@@ -120,7 +123,7 @@ class FWE_DLLPUBLIC AddonMenuManager
  sal_uInt16 nUniqueMenuId,
  com::sun::star::uno::Sequence 
com::sun::star::uno::Sequence com::sun::star::beans::PropertyValue   
aAddonMenuDefinition, 
  const com::sun::star::uno::Reference 
com::sun::star::frame::XFrame  rFrame,
- const com::sun::star::uno::Reference 
com::sun::star::frame::XModel  rModel );
+ const ::rtl::OUString rModuleIdentifier 
);
 
 // Retrieve the menu entry property values from a sequence
 static void

svn commit: r1567072 - /openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx

[hanya]

Author: hanya
Date: Tue Feb 11 11:58:13 2014
New Revision: 1567072

URL: http://svn.apache.org/r1567072
Log:
#i56998# add space separator on the preview zoom control of the preview toolbar

Modified:
openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx

Modified: openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx?rev=1567072r1=1567071r2=1567072view=diff
==
--- openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/ribbar/workctrl.cxx Tue Feb 11 11:58:13 
2014
@@ -799,7 +799,7 @@ SwZoomBox_Impl::SwZoomBox_Impl(
 for(sal_uInt16 i = 0; i  sizeof(aZoomValues)/sizeof(sal_uInt16); i++)
 {
 String sEntry = String::CreateFromInt32(aZoomValues[i]);
-sEntry += '%';
+sEntry.AppendAscii(  % );
 InsertEntry(sEntry);
 }
 }
@@ -931,7 +931,7 @@ void SwPreviewZoomControl::StateChanged(
 if(SFX_ITEM_AVAILABLE = eState)
 {
 String sZoom(String::CreateFromInt32(((const 
SfxUInt16Item*)pState)-GetValue()));
-sZoom += '%';
+sZoom.AppendAscii(  % );
 pBox-SetText(sZoom);
 pBox-SaveValue();
 }

svn commit: r1560642 - /openoffice/trunk/main/sc/source/ui/miscdlgs/inscodlg.cxx

[hanya]

Author: hanya
Date: Thu Jan 23 11:28:01 2014
New Revision: 1560642

URL: http://svn.apache.org/r1560642
Log:
#i123626# change default for paste special dialog of Calc to Text, Numbers and 
Date and time

Modified:
openoffice/trunk/main/sc/source/ui/miscdlgs/inscodlg.cxx

Modified: openoffice/trunk/main/sc/source/ui/miscdlgs/inscodlg.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/miscdlgs/inscodlg.cxx?rev=1560642r1=1560641r2=1560642view=diff
==
--- openoffice/trunk/main/sc/source/ui/miscdlgs/inscodlg.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/miscdlgs/inscodlg.cxx Thu Jan 23 
11:28:01 2014
@@ -37,10 +37,8 @@
 
 //==
 
-sal_Bool   ScInsertContentsDlg::bPreviousAllCheck = sal_True;
-sal_uInt16 ScInsertContentsDlg::nPreviousChecks   = (IDF_DATETIME | IDF_STRING 
 |
-   
 IDF_NOTE | IDF_FORMULA |
-   
 IDF_ATTRIB   | IDF_OBJECTS);
+sal_Bool   ScInsertContentsDlg::bPreviousAllCheck = sal_False;
+sal_uInt16 ScInsertContentsDlg::nPreviousChecks   = (IDF_VALUE | IDF_DATETIME 
| IDF_STRING);
 sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC;
 sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0;
 sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE;  // enum 
InsCellCmd

svn commit: r1560073 - /openoffice/trunk/main/extras/source/autotext/lang/en-US/acor_en-US.dat

[hanya]

Author: hanya
Date: Tue Jan 21 16:36:08 2014
New Revision: 1560073

URL: http://svn.apache.org/r1560073
Log:
#i124067# remove naive entry from auto correct list for en-US

Modified:
openoffice/trunk/main/extras/source/autotext/lang/en-US/acor_en-US.dat

Modified: openoffice/trunk/main/extras/source/autotext/lang/en-US/acor_en-US.dat
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/extras/source/autotext/lang/en-US/acor_en-US.dat?rev=1560073r1=1560072r2=1560073view=diff
==
Binary files - no diff available.

svn commit: r1560262 - /openoffice/trunk/main/vcl/source/gdi/dibtools.cxx

[hanya]

Author: hanya
Date: Wed Jan 22 06:16:21 2014
New Revision: 1560262

URL: http://svn.apache.org/r1560262
Log:
#i106063# avoid additional seek for true color DIB

The position in the stream is already at the end of color palette.

Modified:
openoffice/trunk/main/vcl/source/gdi/dibtools.cxx

Modified: openoffice/trunk/main/vcl/source/gdi/dibtools.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/gdi/dibtools.cxx?rev=1560262r1=1560261r2=1560262view=diff
==
--- openoffice/trunk/main/vcl/source/gdi/dibtools.cxx (original)
+++ openoffice/trunk/main/vcl/source/gdi/dibtools.cxx Wed Jan 22 06:16:21 2014
@@ -419,12 +419,6 @@ bool ImplReadDIBBits(SvStream rIStm, DI
 // Read data
if(bNative)
{
-   // true color DIB's can have a (optimization) palette
-   if(rHeader.nColsUsed  8  rHeader.nBitCount)
-{
-   rIStm.SeekRel(rHeader.nColsUsed * ((rHeader.nSize != 
DIBCOREHEADERSIZE ) ? 4 : 3));
-}
-
rIStm.Read(rAcc.GetBuffer(), rHeader.nHeight * nAlignedWidth);
}
else
@@ -460,12 +454,6 @@ bool ImplReadDIBBits(SvStream rIStm, DI
const long nHeight(rHeader.nHeight);
sal_uInt8* pBuf = new sal_uInt8[nAlignedWidth];
 
-   // true color DIB's can have a (optimization) palette
-   if(rHeader.nColsUsed  8  rHeader.nBitCount)
-{
-   rIStm.SeekRel(rHeader.nColsUsed * 
((rHeader.nSize != DIBCOREHEADERSIZE ) ? 4 : 3));
-}
-
const long nI(bTopDown ? 1 : -1);
long nY(bTopDown ? 0 : nHeight - 1);
long nCount(nHeight);

svn commit: r1560270 - in /openoffice/trunk/main/basctl: sdi/baside.sdi source/basicide/baside2.cxx source/basicide/baside2b.cxx source/basicide/baside3.cxx

[hanya]

Author: hanya
Date: Wed Jan 22 07:41:16 2014
New Revision: 1560270

URL: http://svn.apache.org/r1560270
Log:
#i50481# make Select All command working through the main menu of Basic IDE

Modified:
openoffice/trunk/main/basctl/sdi/baside.sdi
openoffice/trunk/main/basctl/source/basicide/baside2.cxx
openoffice/trunk/main/basctl/source/basicide/baside2b.cxx
openoffice/trunk/main/basctl/source/basicide/baside3.cxx

Modified: openoffice/trunk/main/basctl/sdi/baside.sdi
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/sdi/baside.sdi?rev=1560270r1=1560269r2=1560270view=diff
==
--- openoffice/trunk/main/basctl/sdi/baside.sdi (original)
+++ openoffice/trunk/main/basctl/sdi/baside.sdi Wed Jan 22 07:41:16 2014
@@ -101,6 +101,12 @@ shell BasicIDEShell
StateMethod = GetState;
]
 
+   SID_SELECTALL
+   [
+   ExecMethod  = ExecuteCurrent;
+   StateMethod = GetState;
+   ]
+
SID_SEARCH_ITEM
[
ExecMethod  = ExecuteCurrent;

Modified: openoffice/trunk/main/basctl/source/basicide/baside2.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/baside2.cxx?rev=1560270r1=1560269r2=1560270view=diff
==
--- openoffice/trunk/main/basctl/source/basicide/baside2.cxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/baside2.cxx Wed Jan 22 
07:41:16 2014
@@ -1132,6 +1132,14 @@ void __EXPORT ModulWindow::ExecuteComman
GetBreakPointWindow().Invalidate();
}
break;
+   case SID_SELECTALL:
+   {
+   TextSelection aSel( TextPaM( 0, 0 ), TextPaM( 
TEXT_PARA_ALL, 0x ) );
+   TextView * pView = GetEditView();
+   pView-SetSelection( aSel );
+   pView-GetWindow()-GrabFocus();
+   }
+   break;
}
 }
 
@@ -1198,6 +1206,12 @@ void __EXPORT ModulWindow::GetState( Sfx
}
}
break;
+   case SID_SELECTALL:
+   {
+   if ( !GetEditView() )
+   rSet.DisableItem( nWh );
+   }
+   break;
}
}
 }

Modified: openoffice/trunk/main/basctl/source/basicide/baside2b.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/baside2b.cxx?rev=1560270r1=1560269r2=1560270view=diff
==
--- openoffice/trunk/main/basctl/source/basicide/baside2b.cxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/baside2b.cxx Wed Jan 22 
07:41:16 2014
@@ -431,9 +431,7 @@ void __EXPORT EditorWindow::KeyInput( co
sal_Bool bWasModified = pEditEngine-IsModified();
if ( !TextEngine::DoesKeyChangeText( rKEvt ) || ImpCanModify() )
{
-   if ( ( rKEvt.GetKeyCode().GetCode() == KEY_A)  
rKEvt.GetKeyCode().IsMod1() )
-   pEditView-SetSelection( TextSelection( TextPaM( 0, 0 
), TextPaM( 0x, 0x ) ) );
-   else if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y )  
rKEvt.GetKeyCode().IsMod1() )
+   if ( ( rKEvt.GetKeyCode().GetCode() == KEY_Y )  
rKEvt.GetKeyCode().IsMod1() )
bDone = sal_True; // CTRL-Y schlucken, damit kein 
Vorlagenkatalog
else
{

Modified: openoffice/trunk/main/basctl/source/basicide/baside3.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/basctl/source/basicide/baside3.cxx?rev=1560270r1=1560269r2=1560270view=diff
==
--- openoffice/trunk/main/basctl/source/basicide/baside3.cxx (original)
+++ openoffice/trunk/main/basctl/source/basicide/baside3.cxx Wed Jan 22 
07:41:16 2014
@@ -431,6 +431,12 @@ void __EXPORT DialogWindow::GetState( Sf
 rSet.DisableItem( nWh );
 }
break;
+   
+   case SID_SELECTALL:
+   {
+   rSet.DisableItem( nWh );
+   }
+   break;
}
}
 }

svn commit: r1559661 - in /openoffice/trunk/main: sc/source/ui/src/scfuncs.src svx/source/sidebar/area/AreaPropertyPanel.src

[hanya]

Author: hanya
Date: Mon Jan 20 09:55:08 2014
New Revision: 1559661

URL: http://svn.apache.org/r1559661
Log:
#i56998# add space before percent character in text and quick help

Modified:
openoffice/trunk/main/sc/source/ui/src/scfuncs.src
openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.src

Modified: openoffice/trunk/main/sc/source/ui/src/scfuncs.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/src/scfuncs.src?rev=1559661r1=1559660r2=1559661view=diff
==
--- openoffice/trunk/main/sc/source/ui/src/scfuncs.src (original)
+++ openoffice/trunk/main/sc/source/ui/src/scfuncs.src Mon Jan 20 09:55:08 2014
@@ -5448,7 +5448,7 @@ Resource RID_SC_FUNCTION_DESCRIPTIONS2
};
String 5 // Description of Parameter 2
{
-   Text [ en-US ] = The type of the quartile (0 = MIN, 1 
= 25%, 2 = 50 %, 3 = 75 %, 4 =MAX). ;
+   Text [ en-US ] = The type of the quartile (0 = MIN, 1 
= 25 %, 2 = 50 %, 3 = 75 %, 4 = MAX). ;
};
};
 // -=*# Resource for function KGRÖSSTE #*=-

Modified: openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.src?rev=1559661r1=1559660r2=1559661view=diff
==
--- openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.src 
(original)
+++ openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.src Mon Jan 
20 09:55:08 2014
@@ -285,7 +285,7 @@ Control RID_POPUPPANEL_AREAPAGE_TRGR
Border = TRUE ;
 Size = MAP_APPFONT ( CONTROL_WIDTH , MBOX_HEIGHT ) ;
 HelpID = HID_PPROPERTYPANEL_AREA_MTR_TRGR_SVALUE ;
-QuickHelpText [ en-US ] = Enter a transparency value for the 
beginning point of the gradient, where 0% is fully opaque and 100 % is fully 
transparent. ;
+QuickHelpText [ en-US ] = Enter a transparency value for the 
beginning point of the gradient, where 0 % is fully opaque and 100 % is fully 
transparent. ;
TabStop = TRUE ;
Repeat = TRUE ;
Spin = TRUE ;

svn commit: r1559671 - /openoffice/trunk/main/sd/source/ui/slidesorter/controller/SlsListener.cxx

[hanya]

Author: hanya
Date: Mon Jan 20 12:03:42 2014
New Revision: 1559671

URL: http://svn.apache.org/r1559671
Log:
#i11# fix slide selected in Slide Pane with Page Up

The comment in the removed part says to call SelectPage to make 
the slide visible. But the following NotifyCurrentSlideChange method 
calls SelectPage for the page makes it visible if the pane is not updated yet.

Modified:
openoffice/trunk/main/sd/source/ui/slidesorter/controller/SlsListener.cxx

Modified: 
openoffice/trunk/main/sd/source/ui/slidesorter/controller/SlsListener.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/slidesorter/controller/SlsListener.cxx?rev=1559671r1=1559670r2=1559671view=diff
==
--- openoffice/trunk/main/sd/source/ui/slidesorter/controller/SlsListener.cxx 
(original)
+++ openoffice/trunk/main/sd/source/ui/slidesorter/controller/SlsListener.cxx 
Mon Jan 20 12:03:42 2014
@@ -501,11 +501,6 @@ void SAL_CALL Listener::propertyChange (
 String(RTL_CONSTASCII_USTRINGPARAM(Number)));
 sal_Int32 nCurrentPage = 0;
 aPageNumber = nCurrentPage;
-// The selection is already set but we call SelectPage()
-// nevertheless in order to make the new current page the
-// last recently selected page of the PageSelector.  This is
-// used when making the selection visible.
-mrController.GetPageSelector().SelectPage(nCurrentPage-1);
 
mrController.GetCurrentSlideManager()-NotifyCurrentSlideChange(nCurrentPage-1);
 }
 catch (beans::UnknownPropertyException aEvent)

svn commit: r1559489 - /openoffice/trunk/main/vcl/source/control/field.cxx

[hanya]

Author: hanya
Date: Sun Jan 19 11:50:38 2014
New Revision: 1559489

URL: http://svn.apache.org/r1559489
Log:
#i56998# space separater required before parcent character in metric field

Modified:
openoffice/trunk/main/vcl/source/control/field.cxx

Modified: openoffice/trunk/main/vcl/source/control/field.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/control/field.cxx?rev=1559489r1=1559488r2=1559489view=diff
==
--- openoffice/trunk/main/vcl/source/control/field.cxx (original)
+++ openoffice/trunk/main/vcl/source/control/field.cxx Sun Jan 19 11:50:38 2014
@@ -1586,7 +1586,7 @@ XubString MetricFormatter::CreateFieldTe
 aStr += maCustomUnitText;
 else
 {
-if ( meUnit != FUNIT_NONE  meUnit != FUNIT_PERCENT )
+if ( meUnit != FUNIT_NONE )
 aStr += xub_Unicode( ' ' );
 aStr += ImplMetricToString( meUnit );
 }

svn commit: r1559492 - in /openoffice/trunk/main: avmedia/source/framework/mediacontrol.src svx/source/items/svxitems.src svx/source/stbctrls/stbctrls.src

[hanya]

Author: hanya
Date: Sun Jan 19 12:02:25 2014
New Revision: 1559492

URL: http://svn.apache.org/r1559492
Log:
#i56998 add space before percent in zoom strings

Modified:
openoffice/trunk/main/avmedia/source/framework/mediacontrol.src
openoffice/trunk/main/svx/source/items/svxitems.src
openoffice/trunk/main/svx/source/stbctrls/stbctrls.src

Modified: openoffice/trunk/main/avmedia/source/framework/mediacontrol.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/source/framework/mediacontrol.src?rev=1559492r1=1559491r2=1559492view=diff
==
--- openoffice/trunk/main/avmedia/source/framework/mediacontrol.src (original)
+++ openoffice/trunk/main/avmedia/source/framework/mediacontrol.src Sun Jan 19 
12:02:25 2014
@@ -81,21 +81,21 @@ String AVMEDIA_STR_ZOOM 
 
 String AVMEDIA_STR_ZOOM_50 
 {
-   Text[en-US] = 50%;
+   Text[en-US] = 50 %;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM_100
 {
-   Text[en-US] = 100%;
+   Text[en-US] = 100 %;
 };
 
 // 
--
 
 String AVMEDIA_STR_ZOOM_200
 {
-   Text[en-US] = 200%;
+   Text[en-US] = 200 %;
 };
 
 // 
--

Modified: openoffice/trunk/main/svx/source/items/svxitems.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/items/svxitems.src?rev=1559492r1=1559491r2=1559492view=diff
==
--- openoffice/trunk/main/svx/source/items/svxitems.src (original)
+++ openoffice/trunk/main/svx/source/items/svxitems.src Sun Jan 19 12:02:25 2014
@@ -197,15 +197,15 @@ String RID_SVXITEMS_BRUSHSTYLE_DOWNDIAG
 };
 String RID_SVXITEMS_BRUSHSTYLE_25
 {
-   Text = 25% ;
+   Text = 25 % ;
 };
 String RID_SVXITEMS_BRUSHSTYLE_50
 {
-   Text = 50% ;
+   Text = 50 % ;
 };
 String RID_SVXITEMS_BRUSHSTYLE_75
 {
-   Text = 75% ;
+   Text = 75 % ;
 };
 String RID_SVXITEMS_BRUSHSTYLE_BITMAP
 {

Modified: openoffice/trunk/main/svx/source/stbctrls/stbctrls.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/stbctrls/stbctrls.src?rev=1559492r1=1559491r2=1559492view=diff
==
--- openoffice/trunk/main/svx/source/stbctrls/stbctrls.src (original)
+++ openoffice/trunk/main/svx/source/stbctrls/stbctrls.src Sun Jan 19 12:02:25 
2014
@@ -93,31 +93,31 @@ Menu RID_SVXMNU_ZOOM
{
Identifier = ZOOM_200 ;
HelpId = HID_MNU_ZOOM_200 ;
-   Text = 200% ;
+   Text = 200 % ;
};
MenuItem
{
Identifier = ZOOM_150 ;
HelpId = HID_MNU_ZOOM_150 ;
-   Text = 150% ;
+   Text = 150 % ;
};
MenuItem
{
Identifier = ZOOM_100 ;
HelpId = HID_MNU_ZOOM_100 ;
-   Text = 100% ;
+   Text = 100 % ;
};
MenuItem
{
Identifier = ZOOM_75 ;
HelpId = HID_MNU_ZOOM_75 ;
-   Text = 75% ;
+   Text = 75 % ;
};
MenuItem
{
Identifier = ZOOM_50 ;
HelpId = HID_MNU_ZOOM_50 ;
-   Text = 50% ;
+   Text = 50 % ;
};
MenuItem
{

svn commit: r1559496 - in /openoffice/trunk/main: chart2/source/controller/dialogs/ cui/source/dialogs/ cui/source/options/ cui/source/tabpages/ sc/source/ui/pagedlg/ sd/source/ui/animations/ starmath

[hanya]

Author: hanya
Date: Sun Jan 19 13:40:29 2014
New Revision: 1559496

URL: http://svn.apache.org/r1559496
Log:
#i56998# use FUNIT_PERCENT instead of FUNIT_CUSTOM with parcent CustomUnitText 
on metric fields

Modified:

openoffice/trunk/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
openoffice/trunk/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src
openoffice/trunk/main/cui/source/dialogs/colorpicker.src
openoffice/trunk/main/cui/source/dialogs/grfflt.src
openoffice/trunk/main/cui/source/dialogs/zoom.src
openoffice/trunk/main/cui/source/options/optgdlg.src
openoffice/trunk/main/cui/source/tabpages/autocdlg.src
openoffice/trunk/main/cui/source/tabpages/backgrnd.src
openoffice/trunk/main/cui/source/tabpages/chardlg.src
openoffice/trunk/main/cui/source/tabpages/grfpage.src
openoffice/trunk/main/cui/source/tabpages/numpages.src
openoffice/trunk/main/cui/source/tabpages/paragrph.src
openoffice/trunk/main/cui/source/tabpages/tabarea.src
openoffice/trunk/main/cui/source/tabpages/tabline.src
openoffice/trunk/main/cui/source/tabpages/tparea.cxx
openoffice/trunk/main/cui/source/tabpages/tplnedef.cxx
openoffice/trunk/main/sc/source/ui/pagedlg/pagedlg.src
openoffice/trunk/main/sd/source/ui/animations/CustomAnimationDialog.src
openoffice/trunk/main/starmath/source/dialog.cxx
openoffice/trunk/main/starmath/source/smres.src
openoffice/trunk/main/svx/source/dialog/bmpmask.src
openoffice/trunk/main/svx/source/dialog/contdlg.src
openoffice/trunk/main/svx/source/dialog/fontwork.cxx
openoffice/trunk/main/svx/source/dialog/fontwork.src
openoffice/trunk/main/svx/source/engine3d/float3d.src
openoffice/trunk/main/svx/source/sidebar/area/AreaPropertyPanel.src
openoffice/trunk/main/svx/source/sidebar/graphic/GraphicPropertyPanel.src
openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src
openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
openoffice/trunk/main/svx/source/tbxctrls/fontworkgallery.src
openoffice/trunk/main/sw/source/ui/frmdlg/column.src
openoffice/trunk/main/sw/source/ui/misc/pgfnote.src

Modified: 
openoffice/trunk/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src?rev=1559496r1=1559495r2=1559496view=diff
==
--- 
openoffice/trunk/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src 
(original)
+++ 
openoffice/trunk/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src 
Sun Jan 19 13:40:29 2014
@@ -143,8 +143,7 @@ TabPage TP_3D_SCENEGEOMETRY
 First = 0 ;
 Last = 100 ;
 SpinSize = 5 ;
-Unit = FUNIT_CUSTOM ;
-   CustomUnitText = % ;
+Unit = FUNIT_PERCENT ;
};
 };
 

Modified: 
openoffice/trunk/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src?rev=1559496r1=1559495r2=1559496view=diff
==
--- openoffice/trunk/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src 
(original)
+++ openoffice/trunk/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src 
Sun Jan 19 13:40:29 2014
@@ -77,8 +77,7 @@ TabPage TP_OPTIONS
Minimum = -100 ;
Maximum = 100 ;
StrictFormat = TRUE ;
-   Unit = FUNIT_CUSTOM ;
-   CustomUnitText  = % ;
+   Unit = FUNIT_PERCENT ;
First = 1 ;
Last = 100 ;
SpinSize = 1 ;
@@ -104,8 +103,7 @@ TabPage TP_OPTIONS
Minimum = 0 ;
Maximum = 600 ;
StrictFormat = TRUE ;
-   Unit = FUNIT_CUSTOM ;
-   CustomUnitText  = % ;
+   Unit = FUNIT_PERCENT ;
First = 1 ;
Last = 100 ;
SpinSize = 1 ;

Modified: openoffice/trunk/main/cui/source/dialogs/colorpicker.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/colorpicker.src?rev=1559496r1=1559495r2=1559496view=diff
==
--- openoffice/trunk/main/cui/source/dialogs/colorpicker.src (original)
+++ openoffice/trunk/main/cui/source/dialogs/colorpicker.src Sun Jan 19 
13:40:29 2014
@@ -322,8 +322,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Spin = TRUE ;
 Maximum = 100 ;
 Last = 100 ;
-Unit = FUNIT_CUSTOM ;
-CustomUnitText = % ;
+Unit = FUNIT_PERCENT ;
 };
 
 FixedText CT_BRIGHTNESS
@@ -344,8 +343,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Spin = TRUE ;
 Maximum = 100 ;
 Last = 100 ;
-Unit

svn commit: r1559499 - in /openoffice/trunk/main: svtools/source/control/ctrlbox.cxx svx/source/dialog/relfld.cxx

[hanya]

Author: hanya
Date: Sun Jan 19 14:16:45 2014
New Revision: 1559499

URL: http://svn.apache.org/r1559499
Log:
#i56998# use FUNIT_PERCENT on fields that allow relative value

Modified:
openoffice/trunk/main/svtools/source/control/ctrlbox.cxx
openoffice/trunk/main/svx/source/dialog/relfld.cxx

Modified: openoffice/trunk/main/svtools/source/control/ctrlbox.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/control/ctrlbox.cxx?rev=1559499r1=1559498r2=1559499view=diff
==
--- openoffice/trunk/main/svtools/source/control/ctrlbox.cxx (original)
+++ openoffice/trunk/main/svtools/source/control/ctrlbox.cxx Sun Jan 19 
14:16:45 2014
@@ -1387,8 +1387,7 @@ void FontSizeBox::SetRelative( sal_Bool 
 SetDecimalDigits( 0 );
 SetMin( nRelMin );
 SetMax( nRelMax );
-SetCustomUnitText( '%' );
-SetUnit( FUNIT_CUSTOM );
+SetUnit( FUNIT_PERCENT );
 
 Clear();
 sal_uInt16 i = nRelMin;

Modified: openoffice/trunk/main/svx/source/dialog/relfld.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/dialog/relfld.cxx?rev=1559499r1=1559498r2=1559499view=diff
==
--- openoffice/trunk/main/svx/source/dialog/relfld.cxx (original)
+++ openoffice/trunk/main/svx/source/dialog/relfld.cxx Sun Jan 19 14:16:45 2014
@@ -123,8 +123,7 @@ void SvxRelativeField::SetRelative( sal_
SetDecimalDigits( 0 );
SetMin( nRelMin );
SetMax( nRelMax );
-   SetCustomUnitText( String( sal_Unicode( '%' ) ) );
-   SetUnit( FUNIT_CUSTOM );
+SetUnit( FUNIT_PERCENT );
}
else
{

svn commit: r1559501 - /openoffice/trunk/main/svx/source/stbctrls/zoomctrl.cxx

[hanya]

Author: hanya
Date: Sun Jan 19 14:40:52 2014
New Revision: 1559501

URL: http://svn.apache.org/r1559501
Log:
#i56998# add space separator between zoom value and percent on zoom statusbar 
item

Modified:
openoffice/trunk/main/svx/source/stbctrls/zoomctrl.cxx

Modified: openoffice/trunk/main/svx/source/stbctrls/zoomctrl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/stbctrls/zoomctrl.cxx?rev=1559501r1=1559500r2=1559501view=diff
==
--- openoffice/trunk/main/svx/source/stbctrls/zoomctrl.cxx (original)
+++ openoffice/trunk/main/svx/source/stbctrls/zoomctrl.cxx Sun Jan 19 14:40:52 
2014
@@ -132,7 +132,7 @@ void SvxZoomStatusBarControl::StateChang
const SfxUInt16Item* pItem = (const SfxUInt16Item*)pState;
nZoom = pItem-GetValue();
String aStr( String::CreateFromInt32(nZoom) );
-   aStr += '%';
+aStr.AppendAscii(  % );
GetStatusBar().SetItemText( GetId(), aStr );
 
if ( pState-ISA(SvxZoomItem) )
@@ -168,7 +168,7 @@ void SvxZoomStatusBarControl::StateChang
 void SvxZoomStatusBarControl::Paint( const UserDrawEvent )
 {
String aStr( String::CreateFromInt32( nZoom ));
-   aStr += '%';
+aStr.AppendAscii(  % );
GetStatusBar().SetItemText( GetId(), aStr );
 }
 
@@ -212,7 +212,7 @@ void SvxZoomStatusBarControl::Command( c
 
 sal_uIntPtr SvxZoomStatusBarControl::GetDefItemWidth(const StatusBar rStb)
 {
-   long nWidth1 =  rStb.GetTextWidth(String::CreateFromAscii(X%));
+   long nWidth1 =  rStb.GetTextWidth(String::CreateFromAscii(X %));
return nWidth1;
 }
 

svn commit: r1559505 - /openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx

[hanya]

Author: hanya
Date: Sun Jan 19 15:15:38 2014
New Revision: 1559505

URL: http://svn.apache.org/r1559505
Log:
#i56998# add space separater before percent for Combine single line paragraphs 
option in AutoCorrect dialog

Modified:
openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx

Modified: openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx?rev=1559505r1=1559504r2=1559505view=diff
==
--- openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx (original)
+++ openoffice/trunk/main/cui/source/tabpages/autocdlg.cxx Sun Jan 19 15:15:38 
2014
@@ -753,7 +753,7 @@ void OfaSwAutoFmtOptionsPage::Reset( con
nPercent = pOpt-nRightMargin;
sMargin = ' ';
sMargin += String::CreateFromInt32( nPercent );
-   sMargin += '%';
+sMargin.AppendAscii(  % );
pUserData = new ImpUserData(sMargin, 0);
aCheckLB.SetUserData( MERGE_SINGLE_LINE_PARA, pUserData );
 
@@ -817,7 +817,7 @@ IMPL_LINK(OfaSwAutoFmtOptionsPage, EditH
nPercent = (sal_uInt16)aDlg.GetPrcntFld().GetValue();
sMargin = ' ';
sMargin += String::CreateFromInt32( nPercent );
-   sMargin += '%';
+sMargin.AppendAscii(  % );
}
}
aCheckLB.Invalidate();

svn commit: r1559327 - in /openoffice/trunk/main: chart2/source/controller/dialogs/ cui/source/dialogs/ cui/source/tabpages/ editeng/source/items/ sc/source/core/data/ sd/source/ui/animations/ svx/sou

[hanya]

Author: hanya
Date: Sat Jan 18 08:14:47 2014
New Revision: 1559327

URL: http://svn.apache.org/r1559327
Log:
#i56998# add a space separater between value and unit and remove separator 
between value and percent to match with ISO 31-0

Modified:
openoffice/trunk/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src
openoffice/trunk/main/cui/source/dialogs/colorpicker.cxx
openoffice/trunk/main/cui/source/dialogs/colorpicker.src
openoffice/trunk/main/cui/source/dialogs/grfflt.src
openoffice/trunk/main/cui/source/dialogs/zoom.src
openoffice/trunk/main/cui/source/tabpages/tabline.src
openoffice/trunk/main/editeng/source/items/frmitems.cxx
openoffice/trunk/main/editeng/source/items/paraitem.cxx
openoffice/trunk/main/editeng/source/items/textitem.cxx
openoffice/trunk/main/sc/source/core/data/docpool.cxx
openoffice/trunk/main/sd/source/ui/animations/CustomAnimationDialog.src
openoffice/trunk/main/sd/source/ui/animations/SlideTransitionPane.src
openoffice/trunk/main/svx/source/dialog/bmpmask.src
openoffice/trunk/main/svx/source/engine3d/float3d.src
openoffice/trunk/main/svx/source/items/algitem.cxx

openoffice/trunk/main/svx/source/sidebar/text/TextCharacterSpacingControl.cxx
openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src
openoffice/trunk/main/svx/source/svdraw/svdattr.cxx
openoffice/trunk/main/svx/source/svdraw/svdomeas.cxx
openoffice/trunk/main/svx/source/xoutdev/xattr.cxx
openoffice/trunk/main/sw/source/ui/utlui/attrdesc.cxx
openoffice/trunk/main/sw/source/ui/utlui/uiitems.cxx
openoffice/trunk/main/vcl/source/control/field.cxx

Modified: 
openoffice/trunk/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src?rev=1559327r1=1559326r2=1559327view=diff
==
--- openoffice/trunk/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src 
(original)
+++ openoffice/trunk/main/chart2/source/controller/dialogs/tp_SeriesToAxis.src 
Sat Jan 18 08:14:47 2014
@@ -78,7 +78,7 @@ TabPage TP_OPTIONS
Maximum = 100 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
-   CustomUnitText  =  % ;
+   CustomUnitText  = % ;
First = 1 ;
Last = 100 ;
SpinSize = 1 ;
@@ -105,7 +105,7 @@ TabPage TP_OPTIONS
Maximum = 600 ;
StrictFormat = TRUE ;
Unit = FUNIT_CUSTOM ;
-   CustomUnitText  =  % ;
+   CustomUnitText  = % ;
First = 1 ;
Last = 100 ;
SpinSize = 1 ;

Modified: openoffice/trunk/main/cui/source/dialogs/colorpicker.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/colorpicker.cxx?rev=1559327r1=1559326r2=1559327view=diff
==
--- openoffice/trunk/main/cui/source/dialogs/colorpicker.cxx (original)
+++ openoffice/trunk/main/cui/source/dialogs/colorpicker.cxx Sat Jan 18 
08:14:47 2014
@@ -1196,9 +1196,7 @@ ColorPickerDialog::ColorPickerDialog( Wi
 {
 FreeResource();
 
-String sUnitText;
-sUnitText.Append( ' ' );
-sUnitText.Append( (sal_Unicode) 0xb0 );
+String sUnitText( (sal_Unicode) 0xb0 );
 
 maMFHue.SetCustomUnitText( sUnitText );
 

Modified: openoffice/trunk/main/cui/source/dialogs/colorpicker.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/cui/source/dialogs/colorpicker.src?rev=1559327r1=1559326r2=1559327view=diff
==
--- openoffice/trunk/main/cui/source/dialogs/colorpicker.src (original)
+++ openoffice/trunk/main/cui/source/dialogs/colorpicker.src Sat Jan 18 
08:14:47 2014
@@ -323,7 +323,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 100 ;
 Last = 100 ;
 Unit = FUNIT_CUSTOM ;
-CustomUnitText =  % ;
+CustomUnitText = % ;
 };
 
 FixedText CT_BRIGHTNESS
@@ -345,7 +345,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 100 ;
 Last = 100 ;
 Unit = FUNIT_CUSTOM ;
-CustomUnitText =  % ;
+CustomUnitText = % ;
 };
 
 // -
@@ -378,7 +378,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 100 ;
 Last = 100 ;
 Unit = FUNIT_CUSTOM ;
-CustomUnitText =  % ;
+CustomUnitText = % ;
 };
 
 FixedText CT_MAGENTA
@@ -400,7 +400,7 @@ ModalDialog RID_CUI_DIALOG_COLORPICKER
 Maximum = 100 ;
 Last = 100 ;
 Unit = FUNIT_CUSTOM ;
-CustomUnitText =  % ;
+CustomUnitText = % ;
 };
 
 FixedText CT_YELLOW
@@ -422,7 +422,7 @@ ModalDialog

svn commit: r1559330 - /openoffice/trunk/main/vcl/source/window/printdlg.cxx

[hanya]

Author: hanya
Date: Sat Jan 18 08:49:15 2014
New Revision: 1559330

URL: http://svn.apache.org/r1559330
Log:
#i56998# add space separator between value and unit in fixed line around the 
preview on print dialog

Modified:
openoffice/trunk/main/vcl/source/window/printdlg.cxx

Modified: openoffice/trunk/main/vcl/source/window/printdlg.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/window/printdlg.cxx?rev=1559330r1=1559329r2=1559330view=diff
==
--- openoffice/trunk/main/vcl/source/window/printdlg.cxx (original)
+++ openoffice/trunk/main/vcl/source/window/printdlg.cxx Sat Jan 18 08:49:15 
2014
@@ -366,7 +366,8 @@ void PrintDialog::PrintPreviewWindow::se
 }
 Size aLogicPaperSize( LogicToLogic( i_rOrigSize, MapMode( MAP_100TH_MM ), 
MapMode( eUnit ) ) );
 String aNumText( rLocWrap.getNum( aLogicPaperSize.Width(), nDigits ) );
-aBuf.append( aNumText );
+aBuf.append( aNumText )
+.append( sal_Unicode( ' ' ) );
 aBuf.appendAscii( eUnit == MAP_MM ? mm : in );
 if( i_rPaperName.getLength() )
 {
@@ -377,7 +378,8 @@ void PrintDialog::PrintPreviewWindow::se
 maHorzDim.SetText( aBuf.makeStringAndClear() );
 
 aNumText = rLocWrap.getNum( aLogicPaperSize.Height(), nDigits );
-aBuf.append( aNumText );
+aBuf.append( aNumText )
+.append( sal_Unicode( ' ' ) );
 aBuf.appendAscii( eUnit == MAP_MM ? mm : in );
 maVertDim.SetText( aBuf.makeStringAndClear() );
 

svn commit: r1559337 - /openoffice/trunk/main/vcl/source/control/field.cxx

[hanya]

Author: hanya
Date: Sat Jan 18 09:52:44 2014
New Revision: 1559337

URL: http://svn.apache.org/r1559337
Log:
#i56998# percent value should not takes space separator before the character

Modified:
openoffice/trunk/main/vcl/source/control/field.cxx

Modified: openoffice/trunk/main/vcl/source/control/field.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/control/field.cxx?rev=1559337r1=1559336r2=1559337view=diff
==
--- openoffice/trunk/main/vcl/source/control/field.cxx (original)
+++ openoffice/trunk/main/vcl/source/control/field.cxx Sat Jan 18 09:52:44 2014
@@ -1586,7 +1586,7 @@ XubString MetricFormatter::CreateFieldTe
 aStr += maCustomUnitText;
 else
 {
-if ( meUnit != FUNIT_NONE || meUnit != FUNIT_PERCENT )
+if ( meUnit != FUNIT_NONE  meUnit != FUNIT_PERCENT )
 aStr += xub_Unicode( ' ' );
 aStr += ImplMetricToString( meUnit );
 }

svn commit: r1559342 - in /openoffice/trunk/main/wizards/source/importwizard: DialogModul.xba FilesModul.xba

[hanya]

Author: hanya
Date: Sat Jan 18 13:21:35 2014
New Revision: 1559342

URL: http://svn.apache.org/r1559342
Log:
#i95102# support Office 2007 file extensions on the Document Converter

Modified:
openoffice/trunk/main/wizards/source/importwizard/DialogModul.xba
openoffice/trunk/main/wizards/source/importwizard/FilesModul.xba

Modified: openoffice/trunk/main/wizards/source/importwizard/DialogModul.xba
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/source/importwizard/DialogModul.xba?rev=1559342r1=1559341r2=1559342view=diff
==
--- openoffice/trunk/main/wizards/source/importwizard/DialogModul.xba (original)
+++ openoffice/trunk/main/wizards/source/importwizard/DialogModul.xba Sat Jan 
18 13:21:35 2014
@@ -89,7 +89,7 @@ Public XMLTemplateList()
 apos; Applications(X,8) = quot;File:///...quot; (TargetUrl of the 
templates)
 apos; Applications(X,9) = 0   (Key to the 
original Index of the Applications)
 
-Public Const SBMAXEXTENSIONLENGTH = 15
+Public Const SBMAXEXTENSIONLENGTH = 17
 
 
 Sub FillStep_Welcome()
@@ -412,40 +412,40 @@ Sub   SetupMSConfiguration()
sValueName(2) = quot;quot;
 
 apos; See definition of Filtername-Array about meaning of fields
-   MSFilterName(0,0) = quot;docquot;
-   MSFilterName(0,1) = quot;writer8quot;
-   MSFilterName(0,2) = quot;odtquot;
+   MSFilterName(0,0) = quot;doc|docx|docmquot;
+   MSFilterName(0,1) = quot;writer8|writer8|writer8quot;
+   MSFilterName(0,2) = quot;odt|odt|odtquot;
MSFilterName(0,3) = sMSDocumentCheckBox(0)
MSFilterName(0,4) = quot;Wordquot;

 
-   MSFilterName(1,0) = quot;xlsquot;
-   MSFilterName(1,1) = quot;calc8quot;
-   MSFilterName(1,2) = quot;odsquot;
+   MSFilterName(1,0) = quot;xls|xlsx|xlsmquot;
+   MSFilterName(1,1) = quot;calc8|calc8|calc8quot;
+   MSFilterName(1,2) = quot;ods|ods|odsquot;
MSFilterName(1,3) = sMSDocumentCheckBox(1)
MSFilterName(1,4) = quot;Excelquot;
 
-   MSFilterName(2,0) = quot;ppt|ppsquot;
-   MSFilterName(2,1) = quot;impress8|impress8quot;
-   MSFilterName(2,2) = quot;odp|odpquot;
+   MSFilterName(2,0) = quot;ppt|pps|pptx|pptmquot;
+   MSFilterName(2,1) = quot;impress8|impress8|impress8|impress8quot;
+   MSFilterName(2,2) = quot;odp|odp|odp|odpquot;
MSFilterName(2,3) = sMSDocumentCheckBox(2)
MSFilterName(2,4) = quot;PowerPointquot;
 
-   MSFilterName(3,0) = quot;dotquot;
-   MSFilterName(3,1) = quot;writer8_templatequot;
-   MSFilterName(3,2) = quot;ottquot;
+   MSFilterName(3,0) = quot;dot|dotx|dotmquot;
+   MSFilterName(3,1) = 
quot;writer8_template|writer8_template|writer8_templatequot;
+   MSFilterName(3,2) = quot;ott|ott|ottquot;
MSFilterName(3,3) = sMSTemplateCheckBox(0)
MSFilterName(3,4) = quot;Wordquot;

-   MSFilterName(4,0) = quot;xltquot;
-   MSFilterName(4,1) = quot;calc8_templatequot;
-   MSFilterName(4,2) = quot;otsquot;
+   MSFilterName(4,0) = quot;xlt|xltx|xltmquot;
+   MSFilterName(4,1) = 
quot;calc8_template|calc8_template|calc8_templatequot;
+   MSFilterName(4,2) = quot;ots|ots|otsquot;
MSFilterName(4,3) = sMSTemplateCheckBox(1)
MSFilterName(4,4) = quot;Excelquot;   
 
-   MSFilterName(5,0) = quot;potquot;
-   MSFilterName(5,1) = quot;impress8_templatequot;
-   MSFilterName(5,2) = quot;otpquot;
+   MSFilterName(5,0) = quot;pot|potx|potmquot;
+   MSFilterName(5,1) = 
quot;impress8_template|impress8_template|impress8_templatequot;
+   MSFilterName(5,2) = quot;otp|otp|otpquot;
MSFilterName(5,3) = sMSTemplateCheckBox(2)
MSFilterName(5,4) = quot;PowerPointquot;  
 End Sub

Modified: openoffice/trunk/main/wizards/source/importwizard/FilesModul.xba
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/source/importwizard/FilesModul.xba?rev=1559342r1=1559341r2=1559342view=diff
==
--- openoffice/trunk/main/wizards/source/importwizard/FilesModul.xba (original)
+++ openoffice/trunk/main/wizards/source/importwizard/FilesModul.xba Sat Jan 18 
13:21:35 2014
@@ -456,7 +456,7 @@ Dim s as Integer
FirstList(i,1) = SecList(s,1)
sLocExtension = lcase(FirstList(i,1))
Select Case sLocExtension
-   Case quot;sdwquot;, quot;sdcquot;, quot;sdaquot;, 
quot;sddquot;, quot;smfquot;, quot;sglquot;, quot;docquot;, 
quot;xlsquot;, quot;pptquot;, quot;sxiquot; , quot;sxwquot; , 
quot;sxdquot; , quot;sxgquot; , quot;sxmquot; , quot;sxcquot; , 
quot;ppsquot;
+   Case quot;sdwquot;, quot;sdcquot;, quot;sdaquot;, 
quot;sddquot;, quot;smfquot;, quot;sglquot;, quot;docquot;, 
quot;xlsquot;, quot;pptquot;, quot;sxiquot; , quot;sxwquot; , 
quot;sxdquot; , quot;sxgquot; , quot

svn commit: r1559347 - in /openoffice/trunk/main: helpcontent2/source/text/scalc/01/12120100.xhp sc/source/ui/dbgui/validate.src

[hanya]

Author: hanya
Date: Sat Jan 18 14:34:06 2014
New Revision: 1559347

URL: http://svn.apache.org/r1559347
Log:
#i92785# fix label from Allow blank cells to Allow empty cells on Criteria tabl 
of Validity dialog

Suggest By: joropojor...@pioneerwireless.net

Modified:
openoffice/trunk/main/helpcontent2/source/text/scalc/01/12120100.xhp
openoffice/trunk/main/sc/source/ui/dbgui/validate.src

Modified: openoffice/trunk/main/helpcontent2/source/text/scalc/01/12120100.xhp
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/helpcontent2/source/text/scalc/01/12120100.xhp?rev=1559347r1=1559346r2=1559347view=diff
==
--- openoffice/trunk/main/helpcontent2/source/text/scalc/01/12120100.xhp 
(original)
+++ openoffice/trunk/main/helpcontent2/source/text/scalc/01/12120100.xhp Sat 
Jan 18 14:34:06 2014
@@ -129,8 +129,8 @@ YJ: checked/lastedited
 
 !-- removed HID SC:TRISTATEBOX:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS --
 bookmark xml-lang=en-US 
branch=hid/sc:CheckBox:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS id=bm_id263985 
localize=false/
-paragraph role=heading id=hd_id3154704 xml-lang=en-US level=2 
l10n=CHG oldref=7Allow blank cells/paragraph
-paragraph role=paragraph id=par_id3153967 xml-lang=en-US l10n=CHG 
oldref=8ahelp hid=SC:TRISTATEBOX:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKSIn 
conjunction with emphTools - Detective - Mark invalid Data/emph, this 
defines that blank cells are shown as invalid data (disabled) or not 
(enabled)./ahelp/paragraph
+paragraph role=heading id=hd_id3154704 xml-lang=en-US level=2 
l10n=CHG oldref=7Allow empty cells/paragraph
+paragraph role=paragraph id=par_id3153967 xml-lang=en-US l10n=CHG 
oldref=8ahelp hid=SC:TRISTATEBOX:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKSIn 
conjunction with emphTools - Detective - Mark invalid Data/emph, this 
defines that empty cells are shown as invalid data (disabled) or not 
(enabled)./ahelp/paragraph
 bookmark xml-lang=en-US 
branch=hid/sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST id=bm_id5339518 
localize=false/
 paragraph role=heading id=par_idN10709 xml-lang=en-US level=2 
l10n=NEWShow selection list/paragraph
 paragraph role=paragraph id=par_idN1070D xml-lang=en-US 
l10n=NEWahelp hid=sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLISTShows a 
list of all valid strings or values to select from. The list can also be opened 
by selecting the cell and pressing Ctrl+D (Mac: Command+D)./ahelp/paragraph

Modified: openoffice/trunk/main/sc/source/ui/dbgui/validate.src
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/dbgui/validate.src?rev=1559347r1=1559346r2=1559347view=diff
==
--- openoffice/trunk/main/sc/source/ui/dbgui/validate.src (original)
+++ openoffice/trunk/main/sc/source/ui/dbgui/validate.src Sat Jan 18 14:34:06 
2014
@@ -197,7 +197,7 @@ TabPage TP_VALIDATION_VALUES
//--Modified by PengYunQuan for Validity Cell Range Picker
 Size = MAP_APPFONT ( 174 , 10 ) ;
 TabStop = TRUE ;
-Text [ en-US ] = Allow ~blank cells ;
+Text [ en-US ] = Allow ~empty cells ;
};
 CheckBox CB_SHOWLIST
 {

svn commit: r1559306 - /openoffice/trunk/main/wizards/com/sun/star/wizards/letter/LocaleCodes.java

[hanya]

Author: hanya
Date: Sat Jan 18 02:36:25 2014
New Revision: 1559306

URL: http://svn.apache.org/r1559306
Log:
#i124045# fix resource id for STR_ARR_SVT_LANGUAGE_TABLE used in Letter wizard 
to match with svtools.hrc

Modified:
openoffice/trunk/main/wizards/com/sun/star/wizards/letter/LocaleCodes.java

Modified: 
openoffice/trunk/main/wizards/com/sun/star/wizards/letter/LocaleCodes.java
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/wizards/com/sun/star/wizards/letter/LocaleCodes.java?rev=1559306r1=1559305r2=1559306view=diff
==
--- openoffice/trunk/main/wizards/com/sun/star/wizards/letter/LocaleCodes.java 
(original)
+++ openoffice/trunk/main/wizards/com/sun/star/wizards/letter/LocaleCodes.java 
Sat Jan 18 02:36:25 2014
@@ -36,7 +36,7 @@ public class LocaleCodes extends Resourc
 public LocaleCodes(XMultiServiceFactory xmsf)
 {
 super(xmsf, UNIT_NAME, MODULE_NAME);
-allLanguageStrings = getStringList(16635);  // 
STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
+allLanguageStrings = getStringList(16638);  // 
STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
 }
 
 public String getLanguageString(String MSID)

svn propchange: r1558396 - svn:log

[hanya]

Author: hanya
Revision: 1558396
Modified property: svn:log

Modified: svn:log at Wed Jan 15 14:40:53 2014
--
--- svn:log (original)
+++ svn:log Wed Jan 15 14:40:53 2014
@@ -1 +1 @@
-#i
+#i123725# choose by default the following options, Insert or delete cells and 
Keep formatting options on define database range dialog

svn commit: r1558406 - /openoffice/trunk/main/offapi/com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.idl

[hanya]

Author: hanya
Date: Wed Jan 15 14:48:44 2014
New Revision: 1558406

URL: http://svn.apache.org/r1558406
Log:
#i121950# remove the document for unused parameter from the document for 
recognizeTextRange method

Modified:

openoffice/trunk/main/offapi/com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.idl

Modified: 
openoffice/trunk/main/offapi/com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.idl?rev=1558406r1=1558405r2=1558406view=diff
==
--- 
openoffice/trunk/main/offapi/com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.idl
 (original)
+++ 
openoffice/trunk/main/offapi/com/sun/star/smarttags/XRangeBasedSmartTagRecognizer.idl
 Wed Jan 15 14:48:44 2014
@@ -75,9 +75,6 @@ interface XRangeBasedSmartTagRecognizer:
 @param eDataType
 This value indicates the type of the passed text.
 
-@param aLocale
-Is used to indicate the language of the passed text.
-
 @param xTextMarkup
 This object is used to submit any recognized smart tags
 to the calling application.

svn commit: r1557669 - /openoffice/trunk/main/offapi/com/sun/star/awt/XMouseMotionListener.idl

[hanya]

Author: hanya
Date: Mon Jan 13 09:14:35 2014
New Revision: 1557669

URL: http://svn.apache.org/r1557669
Log:
#i72591# fix from mouse button to mouse pointer in documentation of mouseMoved 
method

Patch By: christianjun...@gmail.com

Modified:
openoffice/trunk/main/offapi/com/sun/star/awt/XMouseMotionListener.idl

Modified: openoffice/trunk/main/offapi/com/sun/star/awt/XMouseMotionListener.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/awt/XMouseMotionListener.idl?rev=1557669r1=1557668r2=1557669view=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/awt/XMouseMotionListener.idl 
(original)
+++ openoffice/trunk/main/offapi/com/sun/star/awt/XMouseMotionListener.idl Mon 
Jan 13 09:14:35 2014
@@ -56,7 +56,7 @@ published interface XMouseMotionListener
  

//- 
 
-   /** is invoked when the mouse button has been moved on a window
+   /** is invoked when the mouse pointer has been moved on a window
(with no buttons down).
 */
void mouseMoved( [in] com::sun::star::awt::MouseEvent e ); 

svn commit: r1557518 - in /openoffice/trunk/main/odk: docs/install.html docs/tools.html examples/examples.html index.html

[hanya]

Author: hanya
Date: Sun Jan 12 12:02:24 2014
New Revision: 1557518

URL: http://svn.apache.org/r1557518
Log:
#i124015# fix errors in html files of SDK

Modified:
openoffice/trunk/main/odk/docs/install.html
openoffice/trunk/main/odk/docs/tools.html
openoffice/trunk/main/odk/examples/examples.html
openoffice/trunk/main/odk/index.html

Modified: openoffice/trunk/main/odk/docs/install.html
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/odk/docs/install.html?rev=1557518r1=1557517r2=1557518view=diff
==
--- openoffice/trunk/main/odk/docs/install.html (original)
+++ openoffice/trunk/main/odk/docs/install.html Sun Jan 12 12:02:24 2014
@@ -68,7 +68,7 @@
  /td
  /tr 
  tr valign=top 
-  tdbApache OpenOffice %PRODUCT_RELEASE% installation/td
+  tdbApache OpenOffice %PRODUCT_RELEASE% installation/b/td
   td class=content80The SDK works on top of an existing office 
  installation and uses the same libraries as the office 
installation./td
   /tr
@@ -77,7 +77,7 @@
 td colspan=2img class=line src=images/sdk_line-1.gif/td
   /tr
  tr valign=top 
-  tdbJDK (1.5 or higher)b/td
+  tdbJDK (1.5 or higher)/b/td
   td class=content80
  pA JDK is necessary for developing Java components or 
applications. An appropriate Java SDK can be found on a target=_blank 
href=http://java.sun.com/products; title=link to the Java SDK download page 
(online)http://java.sun.com/products/a./p
  pRecommendation is to use Java 6 excepting for Mac OS 
because initially Mac OS supported a 64bit version of Java 6 only./p
@@ -87,7 +87,7 @@
 td colspan=2img class=line src=images/sdk_line-1.gif/td
   /tr
  tr valign=top 
-  tdbC++ compilerb/td
+  tdbC++ compiler/b/td
   td class=content80A C++ compiler is necessary for developing C++ 
  components or applications. UNO depends on a compiler 
dependent language 
  binding, so that we use the appropriate compiler where a 
language binding 
@@ -106,13 +106,13 @@
  td class=cell80Microsoft C++ Compiler, Microsoft Visual 
Studio 2008 or the Express version (cl, version 15.00.21022)/td
  /tr
  /table
- pbNote/b: The C++ compiler is buoptional/u/b! 
If you use the Express edition you have to ensure that the a 
href=http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BFdisplaylang=en;Microsoft
 Visual Studio 2008 Redistributable Package/a is also installed. You can 
download this package from Microsoft directly./a/p/td
+ pbNote/b: The C++ compiler is buoptional/u/b! 
If you use the Express edition you have to ensure that the a 
href=http://www.microsoft.com/downloads/details.aspx?familyid=9B2DA534-3E03-4391-8A4D-074B9F2BC1BFdisplaylang=en;Microsoft
 Visual Studio 2008 Redistributable Package/a is also installed. You can 
download this package from Microsoft directly./p/td
   /tr
  tr valign=middle 
 td colspan=2img class=line src=images/sdk_line-1.gif/td
   /tr
  tr valign=top 
-  tdbMicrosoft .NET Framework SDK version 1.0 or higherb/td
+  tdbMicrosoft .NET Framework SDK version 1.0 or higher/b/td
   td class=content80The SDK is required for building CLI 
applications. 
  That is, programs written in languages, such as C# or 
VB.NET.br
  pbNote/b: The .NET Framework is 
buoptional/u/b!/p/td
@@ -121,7 +121,7 @@
 td colspan=2img class=line src=images/sdk_line-1.gif/td
   /tr
  tr valign=top 
-  tdbGNU make (3.79.1 or higher)b/td
+  tdbGNU make (3.79.1 or higher)/b/td
   td class=content80
  pGNU make is used to build the examples of the SDK. GNU 
make is available from a target=_blank href=http://www.gnu.org; title=link 
to www.gnu.org (online)http://www.gnu.org/a. It can be ftped via a 
target=_blank href=ftp://ftp.gnu.org/gnu/make; title=link to gnumake on 
www.gnu.org (online)ftp://ftp.gnu.org/gnu/make/a/p
  pbNote/b: Windows user can find an executable of gnu 
make under a target=_blank href=http://www.mingw.org/wiki/Getting_Started; 
title=link to the MinGW Getting Started wiki 
(online)http://www.mingw.org/wiki/Getting_Started/a (see the mingw32-make 
link under quot;Manual Installationquot;). Do not use the Cygwin make, 
because it does not
@@ -131,7 +131,7 @@
 td colspan=2img class=line src=images/sdk_line-1.gif/td
   /tr
  tr valign=top 
-  tdbzip tool (2.3 or higher)b/td
+  tdbzip tool (2.3 or higher)/b/td
   td class=content80The zip tool is used

svn commit: r1557329 - /openoffice/trunk/main/svtools/source/edit/textview.cxx

[hanya]

Author: hanya
Date: Sat Jan 11 09:17:58 2014
New Revision: 1557329

URL: http://svn.apache.org/r1557329
Log:
#i106665# fix failed to replace with empty string on text view

Modified:
openoffice/trunk/main/svtools/source/edit/textview.cxx

Modified: openoffice/trunk/main/svtools/source/edit/textview.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/edit/textview.cxx?rev=1557329r1=1557328r2=1557329view=diff
==
--- openoffice/trunk/main/svtools/source/edit/textview.cxx (original)
+++ openoffice/trunk/main/svtools/source/edit/textview.cxx Sat Jan 11 09:17:58 
2014
@@ -1378,7 +1378,7 @@ void TextView::InsertNewText( const rtl:
 */
 sal_Int32 nLen = rStr.getLength();
 sal_Int32 nPos = 0;
-while( nLen )
+do
 {
 sal_Int32 nChunkLen = nLen  65534 ? 65534 : nLen;
 String aChunk( rStr.copy( nPos, nChunkLen ) );
@@ -1400,7 +1400,7 @@ void TextView::InsertNewText( const rtl:
 ImpSetSelection( aNewSel );
 nLen -= nChunkLen;
 nPos += nChunkLen;
-}
+} while( nLen );
 mpImpl-mpTextEngine-UndoActionEnd();
 
 mpImpl-mpTextEngine-FormatAndUpdate( this );

svn commit: r1557095 - /openoffice/trunk/main/sc/source/ui/app/inputwin.cxx

[hanya]

Author: hanya
Date: Fri Jan 10 11:47:19 2014
New Revision: 1557095

URL: http://svn.apache.org/r1557095
Log:
#i42309# change behavior for equal button of input line according to the 
current content of the cell

Modified:
openoffice/trunk/main/sc/source/ui/app/inputwin.cxx

Modified: openoffice/trunk/main/sc/source/ui/app/inputwin.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/app/inputwin.cxx?rev=1557095r1=1557094r2=1557095view=diff
==
--- openoffice/trunk/main/sc/source/ui/app/inputwin.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/app/inputwin.cxx Fri Jan 10 11:47:19 2014
@@ -461,12 +461,46 @@ void __EXPORT ScInputWindow::Select()
if ( pScMod-IsEditMode() ) // 
nicht, wenn z.B. geschuetzt
{
aTextWindow.GrabFocus();
-   aTextWindow.SetTextString( '=' );
+   
+   xub_StrLen nStartPos = 1;
+   xub_StrLen nEndPos = 1;
+   
+   ScTabViewShell* pViewSh = PTR_CAST( 
ScTabViewShell, SfxViewShell::Current() );
+   if ( pViewSh )
+   {
+   const String aString = 
aTextWindow.GetTextString();
+   const xub_StrLen nLen = aString.Len();
+   
+   ScDocument* pDoc = 
pViewSh-GetViewData()-GetDocument();
+   CellType eCellType = pDoc-GetCellType( 
pViewSh-GetViewData()-GetCurPos() );
+   switch ( eCellType )
+   {
+   case CELLTYPE_VALUE:
+   {
+   nEndPos = nLen +1;
+   String aNewStr( '=' );
+   aNewStr.Append( aString 
);
+   
aTextWindow.SetTextString( aNewStr );
+   break;
+   }
+   case CELLTYPE_STRING:
+   case CELLTYPE_EDIT:
+   nStartPos = 0;
+   nEndPos = nLen;
+   break;
+   case CELLTYPE_FORMULA:
+   nEndPos = nLen;
+   break;
+   default:
+   
aTextWindow.SetTextString( '=' );
+   break;
+   }
+   }
 
EditView* pView = aTextWindow.GetEditView();
if (pView)
{
-   pView-SetSelection( ESelection(0,1, 
0,1) );
+   pView-SetSelection( ESelection(0, 
nStartPos, 0, nEndPos) );
pScMod-InputChanged(pView);
SetOkCancelMode();

pView-SetEditEngineUpdateMode(sal_True);

svn commit: r1557152 - /openoffice/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx

[hanya]

Author: hanya
Date: Fri Jan 10 15:30:03 2014
New Revision: 1557152

URL: http://svn.apache.org/r1557152
Log:
#i97129# fix hidden slide shown when going back to previous slide from finish 
screen

Modified:
openoffice/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx

Modified: openoffice/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx?rev=1557152r1=1557151r2=1557152view=diff
==
--- openoffice/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx (original)
+++ openoffice/trunk/main/sd/source/ui/slideshow/slideshowimpl.cxx Fri Jan 10 
15:30:03 2014
@@ -3381,7 +3381,7 @@ void SlideshowImpl::gotoPreviousSlide (c
const ShowWindowMode eMode = mpShowWindow-GetShowWindowMode();
if( eMode == SHOWWINDOWMODE_END )
{
-   const sal_Int32 nLastSlideIndex = 
mpSlideController-getSlideIndexCount() - 1;
+   const sal_Int32 nLastSlideIndex = 
mpSlideController-getCurrentSlideIndex();
if( nLastSlideIndex = 0 )
mpShowWindow-RestartShow( nLastSlideIndex );
}

svn commit: r1556759 - /openoffice/trunk/main/offapi/com/sun/star/sheet/Shape.idl

[hanya]

Author: hanya
Date: Thu Jan  9 08:30:57 2014
New Revision: 1556759

URL: http://svn.apache.org/r1556759
Log:
#i124001# remove readonly flag from Anchor property

Modified:
openoffice/trunk/main/offapi/com/sun/star/sheet/Shape.idl

Modified: openoffice/trunk/main/offapi/com/sun/star/sheet/Shape.idl
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/sheet/Shape.idl?rev=1556759r1=1556758r2=1556759view=diff
==
--- openoffice/trunk/main/offapi/com/sun/star/sheet/Shape.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/sheet/Shape.idl Thu Jan  9 
08:30:57 2014
@@ -45,7 +45,7 @@ service Shape
/** contains the object where this shape is anchored on.
p Possible objects are XSpreadsheet and XCell./p
*/
-   [readonly, property] com::sun::star::uno::XInterface Anchor;
+   [property] com::sun::star::uno::XInterface Anchor;

//-
/** contains the horizontal position of the object (1/100 mm).
p The position is relative to the anchor object./p

svn commit: r1556461 - /openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx

[hanya]

Author: hanya
Date: Wed Jan  8 08:11:15 2014
New Revision: 1556461

URL: http://svn.apache.org/r1556461
Log:
#i18109# pre-select the name in new style dialog

Modified:
openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx

Modified: openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx?rev=1556461r1=1556460r2=1556461view=diff
==
--- openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx (original)
+++ openoffice/trunk/main/sfx2/source/dialog/mgetempl.cxx Wed Jan  8 08:11:15 
2014
@@ -494,6 +494,7 @@ void SfxManageStyleSheetPage::Reset( con
if ( sCmp != aName )
pStyle-SetName( aName );
aNameEd.SetText( aName );
+   aNameEd.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
 
if ( aFollowLb.IsEnabled() )
{

svn commit: r1556463 - /openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx

[hanya]

Author: hanya
Date: Wed Jan  8 08:36:06 2014
New Revision: 1556463

URL: http://svn.apache.org/r1556463
Log:
#i118909# fix empty elements of return value in 
UICategoryDescription::getElementNames

Modified:
openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx

Modified: 
openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx?rev=1556463r1=1556462r2=1556463view=diff
==
--- openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx 
(original)
+++ openoffice/trunk/main/framework/source/uielement/uicommanddescription.cxx 
Wed Jan  8 08:36:06 2014
@@ -761,7 +761,7 @@ throw (::com::sun::star::uno::RuntimeExc
 ModuleToCommandFileMap::const_iterator pIter = 
m_aModuleToCommandFileMap.begin();
 while ( pIter != m_aModuleToCommandFileMap.end() )
 {
-aSeq[n] = pIter-first;
+aSeq[n++] = pIter-first;
 ++pIter;
 }
 

svn commit: r1556530 - /openoffice/trunk/main/vcl/source/control/menubtn.cxx

[hanya]

Author: hanya
Date: Wed Jan  8 13:51:46 2014
New Revision: 1556530

URL: http://svn.apache.org/r1556530
Log:
#i118357# allow to open recent list of documents in the hole right part of the 
open button separated by the vertical line on the Start Center

Modified:
openoffice/trunk/main/vcl/source/control/menubtn.cxx

Modified: openoffice/trunk/main/vcl/source/control/menubtn.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/control/menubtn.cxx?rev=1556530r1=1556529r2=1556530view=diff
==
--- openoffice/trunk/main/vcl/source/control/menubtn.cxx (original)
+++ openoffice/trunk/main/vcl/source/control/menubtn.cxx Wed Jan  8 13:51:46 
2014
@@ -161,7 +161,9 @@ void MenuButton::MouseButtonDown( const 
{
// if the separated dropdown symbol is hit,
// execute the popup immediately
-   if( ! ImplGetSymbolRect().IsInside( rMEvt.GetPosPixel() ) )
+if ( ImplGetSymbolRect().IsEmpty() || 
+( PushButton::ImplHitTestPushButton( this, rMEvt.GetPosPixel() ) 
 
+rMEvt.GetPosPixel().X()  ImplGetSymbolRect().Left() ) )
{
 if ( !mpMenuTimer )
 {

svn commit: r1554205 - /openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx

[hanya]

Author: hanya
Date: Mon Dec 30 13:13:35 2013
New Revision: 1554205

URL: http://svn.apache.org/r1554205
Log:
#i122950# fix duplicated input when input method convert a character on gtk 
environment

Modified:
openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx

Modified: openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx?rev=1554205r1=1554204r2=1554205view=diff
==
--- openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx (original)
+++ openoffice/trunk/main/vcl/unx/gtk/window/gtkframe.cxx Mon Dec 30 13:13:35 
2013
@@ -3553,6 +3553,11 @@ void GtkSalFrame::IMHandler::signalIMCom
 {
 GTK_YIELD_GRAB();
 
+bool bWasPreedit =
+(pThis-m_aInputEvent.mpTextAttr != 0) ||
+pThis-m_bPreeditJustChanged;
+pThis-m_bPreeditJustChanged = false;
+
 pThis-m_aInputEvent.mnTime= 0;
 pThis-m_aInputEvent.mpTextAttr= 0;
 pThis-m_aInputEvent.maText= String( pText, 
RTL_TEXTENCODING_UTF8 );
@@ -3576,9 +3581,7 @@ void GtkSalFrame::IMHandler::signalIMCom
  *  or because there never was a preedit.
  */
 bool bSingleCommit = false;
-bool bWasPreedit =
-(pThis-m_aInputEvent.mpTextAttr != 0) ||
-pThis-m_bPreeditJustChanged;
+
 if( ! bWasPreedit
  pThis-m_aInputEvent.maText.Len() == 1
  ! pThis-m_aPrevKeyPresses.empty()