You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2019/05/06 14:23:58 UTC
svn commit: r1858809 - in /openoffice/branches/AOO42X: ./
main/starmath/source/toolbox.cxx
Author: mseidel
Date: Mon May 6 14:23:58 2019
New Revision: 1858809
URL: http://svn.apache.org/viewvc?rev=1858809&view=rev
Log:
Merged r1858682 and r1858700 from trunk
- Enable forgotten 5th line for math toolbox
- Set initial size to 5 lines for math toolbox
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/starmath/source/toolbox.cxx
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 6 14:23:58 2019
@@ -9,4 +9,4 @@
/openoffice/branches/ia2:1417739-1541842
/openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700
Modified: openoffice/branches/AOO42X/main/starmath/source/toolbox.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/starmath/source/toolbox.cxx?rev=1858809&r1=1858808&r2=1858809&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/starmath/source/toolbox.cxx (original)
+++ openoffice/branches/AOO42X/main/starmath/source/toolbox.cxx Mon May 6 14:23:58 2019
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -140,7 +140,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBind
SetStyle( GetStyle() | WB_DIALOGCONTROL );
nActiveCategoryRID = USHRT_MAX;
-
+
aToolBoxCat.SetClickHdl(LINK(this, SmToolBoxWindow, CategoryClickHdl));
sal_uInt16 i;
@@ -190,7 +190,7 @@ const ImageList * SmToolBoxWindow::GetIm
// list for later use in the respective array.
const ImageList *pIL = 0;
-
+
// get index to use
sal_uInt16 nCategoryRID = GetCategoryRID( nResId );
sal_Int16 nIndex = GetToolBoxCategoriesIndex( nCategoryRID );
@@ -213,13 +213,13 @@ const ImageList * SmToolBoxWindow::GetIm
void SmToolBoxWindow::ApplyImageLists( sal_uInt16 nCategoryRID )
{
sal_Bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode();
-
+
// set image list for toolbox 'catalog'
const ImageList *pImageList = GetImageList( bHighContrast ? RID_ILH_CATALOG : RID_IL_CATALOG, bHighContrast );
DBG_ASSERT( pImageList, "image list missing" );
if (pImageList)
aToolBoxCat.SetImageList( *pImageList );
-
+
// set image list for active (visible) category of 'catalog'
sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID );
sal_uInt16 nResId = GetImageListRID( nCategoryRID, bHighContrast );
@@ -248,7 +248,7 @@ void SmToolBoxWindow::StateChanged( Stat
AdjustPosSize( bSetPosition );
bSetPosition = sal_False;
}
- //... otherwise the base class will remember the last position of the window
+ // ... otherwise the base class will remember the last position of the window
SfxFloatingWindow::StateChanged( nStateChange );
}
@@ -256,7 +256,7 @@ void SmToolBoxWindow::StateChanged( Stat
void SmToolBoxWindow::AdjustPosSize( sal_Bool bSetPos )
{
Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) );
- Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 4 /* see nLines in SetCategory*/ ) );
+ Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 5 /* see nLines in SetCategory */ ) );
DBG_ASSERT( aCatSize.Width() == aCmdSize.Width(), "width mismatch" );
// catalog settings
@@ -324,14 +324,14 @@ void SmToolBoxWindow::SetCategory(sal_uI
// check for valid resource id
switch (nCategoryRID)
{
- case RID_UNBINOPS_CAT : nLines = 4; break;
- case RID_RELATIONS_CAT: nLines = 4; break;
- case RID_SETOPERATIONS_CAT: nLines = 4; break;
- case RID_FUNCTIONS_CAT: nLines = 4; break;
+ case RID_UNBINOPS_CAT : nLines = 5; break;
+ case RID_RELATIONS_CAT: nLines = 5; break;
+ case RID_SETOPERATIONS_CAT: nLines = 5; break;
+ case RID_FUNCTIONS_CAT: nLines = 5; break;
case RID_OPERATORS_CAT: nLines = 3; break;
- case RID_ATTRIBUTES_CAT: nLines = 4; break;
+ case RID_ATTRIBUTES_CAT: nLines = 5; break;
case RID_MISC_CAT: nLines = 4; break;
- case RID_BRACKETS_CAT: nLines = 4; break;
+ case RID_BRACKETS_CAT: nLines = 5; break;
case RID_FORMAT_CAT: nLines = 3; break;
default:
// nothing to be done
@@ -397,4 +397,3 @@ SmToolBoxWrapper::SmToolBoxWrapper(Windo
((SfxFloatingWindow *)pWindow)->Initialize(pInfo);
}
-