svn commit: r1676406 - /openoffice/branches/win8build/
Author: steve_y Date: Tue Apr 28 03:24:35 2015 New Revision: 1676406 URL: http://svn.apache.org/r1676406 Log: This is an experimental build for Microsoft Windows 8.x. Added: openoffice/branches/win8build/ (props changed) - copied from r1676405, openoffice/trunk/ Propchange: openoffice/branches/win8build/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Tue Apr 28 03:24:35 2015 @@ -0,0 +1,6 @@ +/openoffice/branches/AOO400:1503684 +/openoffice/branches/AOO410:1572480,1573601,1583349,1583635,1583666 +/openoffice/branches/alg_writerframes:1556289-1579189 +/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
svn commit: r1642310 - in /openoffice/trunk/main: sw/source/filter/rtf/ sw/source/filter/ww8/ writerfilter/source/dmapper/
Author: steve_y
Date: Fri Nov 28 15:27:41 2014
New Revision: 1642310
URL: http://svn.apache.org/r1642310
Log:
Issue 125400 - CJK numbering ordered list fallback to Arabic numerals
Contributor: Mark Hung
Modified:
openoffice/trunk/main/sw/source/filter/rtf/rtfnum.cxx
openoffice/trunk/main/sw/source/filter/ww8/rtfattributeoutput.cxx
openoffice/trunk/main/sw/source/filter/ww8/wrtw8num.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par2.cxx
openoffice/trunk/main/sw/source/filter/ww8/ww8par3.cxx
openoffice/trunk/main/writerfilter/source/dmapper/ConversionHelper.cxx
Modified: openoffice/trunk/main/sw/source/filter/rtf/rtfnum.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/rtf/rtfnum.cxx?rev=1642310r1=1642309r2=1642310view=diff
==
--- openoffice/trunk/main/sw/source/filter/rtf/rtfnum.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/rtf/rtfnum.cxx Fri Nov 28 15:27:41
2014
@@ -57,6 +57,70 @@
#define RTF_NUMRULE_NAME RTF_Num
+static sal_Int16 lcl_GetStyleForNFC( sal_Int16 nNFC)
+{
+static const sal_Int16 aMap[] =
+{
+style::NumberingType::ARABIC, // 0 - Arabic (1, 2, 3)
+style::NumberingType::ROMAN_UPPER, // 1 - Uppercase Roman
numeral (I, II, III)
+style::NumberingType::ROMAN_LOWER, // 2 - Lowercase Roman
numeral (i, ii, iii)
+style::NumberingType::CHARS_UPPER_LETTER_N, // 3 - Uppercase letter
(A, B, C)
+style::NumberingType::CHARS_LOWER_LETTER_N, // 4 - Lowercase letter
(a, b, c)
+style::NumberingType::ARABIC, // 5 - Ordinal number
(1st, 2nd, 3rd)
+style::NumberingType::ARABIC, // 6 - Cardinal text
number (One, Two Three)
+style::NumberingType::ARABIC, // 7 - Ordinal text number
(First, Second, Third)
+style::NumberingType::NUMBER_NONE, // 8 - Not defined
+style::NumberingType::NUMBER_NONE, // 9 - Not defined
+style::NumberingType::NUMBER_LOWER_ZH, // 10 - Kanji numbering
without the digit character (*dbnum1).
+style::NumberingType::NUMBER_LOWER_ZH, // 11 - Kanji numbering
with the digit character (*dbnum2).
+style::NumberingType::AIU_HALFWIDTH_JA, // 12 - phonetic Katakana
characters in aiueo order (*aiueo).
+style::NumberingType::IROHA_HALFWIDTH_JA, // 13 - phonetic katakana
characters in iroha order (*iroha).
+style::NumberingType::FULLWIDTH_ARABIC, // 14 - Double Byte
character
+style::NumberingType::ARABIC, // 15 - Single Byte
character
+style::NumberingType::NUMBER_TRADITIONAL_JA,// 16 - Kanji numbering 3
(*dbnum3).
+style::NumberingType::ARABIC, // 17 - Kanji numbering 4
(*dbnum4).
+style::NumberingType::ARABIC, // 18 - Circle numbering
(*circlenum). - decimalEnclosedCircleChinese
+style::NumberingType::FULLWIDTH_ARABIC, // 19 - Double-byte Arabic
numbering
+style::NumberingType::AIU_FULLWIDTH_JA, // 20 - phonetic
double-byte Katakana characters (*aiueo*dbchar).
+style::NumberingType::IROHA_FULLWIDTH_JA, // 21 - phonetic
double-byte katakana characters (*iroha*dbchar).
+style::NumberingType::ARABIC, // 22 - Arabic with
leading zero (01, 02, 03, ..., 10, 11)
+style::NumberingType::CHAR_SPECIAL, // 23 - Bullet (no number
at all)
+style::NumberingType::HANGUL_SYLLABLE_KO, // 24 - Korean numbering 2
(*ganada).
+style::NumberingType::HANGUL_JAMO_KO, // 25 - Korean numbering 1
(*chosung).
+style::NumberingType::ARABIC, // 26 - Chinese numbering
1 (*gb1). - decimalEnclosedFullstop
+style::NumberingType::ARABIC, // 27 - Chinese numbering
2 (*gb2). - decimalEnclosedParen
+style::NumberingType::ARABIC, // 28 - Chinese numbering
3 (*gb3). - decimalEnclosedCircleChinese
+style::NumberingType::ARABIC, // 29 - Chinese numbering
4 (*gb4). - ideographEnclosedCircle
+style::NumberingType::TIAN_GAN_ZH, // 30 - Chinese Zodiac
numbering 1 (* zodiac1)
+style::NumberingType::DI_ZI_ZH, // 31 - Chinese Zodiac
numbering 2 (* zodiac2)
+style::NumberingType::ARABIC, // 32 - Chinese Zodiac
numbering 3 (* zodiac3)
+style::NumberingType::NUMBER_LOWER_ZH, // 33 - Taiwanese
double-byte numbering 1
+style::NumberingType::NUMBER_UPPER_ZH_TW, // 34 - Taiwanese
double-byte numbering 2
+style::NumberingType::NUMBER_LOWER_ZH, // 35 - Taiwanese
double-byte numbering 3
+style::NumberingType::ARABIC, // 36 - Taiwanese
double-byte numbering 4
+style::NumberingType::NUMBER_LOWER_ZH, // 37 - Chinese
double-byte numbering 1
+style::NumberingType
svn commit: r1642312 - /openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx
Author: steve_y Date: Fri Nov 28 15:30:07 2014 New Revision: 1642312 URL: http://svn.apache.org/r1642312 Log: Issue 125495 - Awkward Chinese (ZH-TW) numbering suffix when importing RTF document Contributor: Mark Hung Modified: openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx Modified: openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx?rev=1642312r1=1642311r2=1642312view=diff == --- openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx (original) +++ openoffice/trunk/main/svtools/source/svrtf/parrtf.cxx Fri Nov 28 15:30:07 2014 @@ -649,20 +649,20 @@ void SvRTFParser::Continue( int nToken ) break; // unbekannte Token ueberspringen case RTF_NEXTTYPE: case RTF_ANSITYPE: -SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 ); +SetEncoding( eCodeSet = RTL_TEXTENCODING_MS_1252 ); break; case RTF_MACTYPE: -SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_APPLE_ROMAN ); +SetEncoding( eCodeSet = RTL_TEXTENCODING_APPLE_ROMAN ); break; case RTF_PCTYPE: -SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_437 ); +SetEncoding( eCodeSet = RTL_TEXTENCODING_IBM_437 ); break; case RTF_PCATYPE: -SetSrcEncoding( eCodeSet = RTL_TEXTENCODING_IBM_850 ); +SetEncoding( eCodeSet = RTL_TEXTENCODING_IBM_850 ); break; case RTF_ANSICPG: eCodeSet = rtl_getTextEncodingFromWindowsCodePage(nTokenValue); -SetSrcEncoding(eCodeSet); +SetEncoding(eCodeSet); break; default: NEXTTOKEN:
svn commit: r1616666 - /openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx
Author: steve_y
Date: Fri Aug 8 03:10:58 2014
New Revision: 161
URL: http://svn.apache.org/r161
Log:
https://issues.apache.org/ooo/show_bug.cgi?id=125391
Fixed by Oliver-Rainer Wittmann
Modified:
openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx
Modified: openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx?rev=161r1=1616665r2=161view=diff
==
--- openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx (original)
+++ openoffice/trunk/main/sw/source/filter/ww8/ww8graf.cxx Fri Aug 8 03:10:58
2014
@@ -2260,28 +2260,23 @@ RndStdIds SwWW8ImplReader::ProcessEscher
sal_uInt32 nXAlign = nCntXAlign pRecord-nXAlign ? pRecord-nXAlign :
1;
sal_uInt32 nYAlign = nCntYAlign pRecord-nYAlign ? pRecord-nYAlign :
1;
- if (pFSPA)
- {
- /*
- #74188# #i15718# #i19008#
- Strangely in this case the FSPA value seems to be considered
before
- the newer escher nXRelTo record.
- */
-// -- OD 2005-08-04 #i52565# - correct condition checking:
-// first check, if nXRelTo and nYRelTo have default values. This
-// is a hint that these values aren't set by the escher import - see
-// method SwMSDffManager::ProcessObj(..). Then, check if for each
-// values, if it differs from the one in the FSPA.
-if ( pRecord-nXRelTo == 2 pRecord-nYRelTo == 2
!bCurSectionVertical)
+if ( pFSPA != NULL )
+{
+// #52565# - try to handle special case for objects in tables
regarding its X Rel
+
+// if X and Y Rel values are on default take it as a hint, that they
have not been set
+// by SwMSDffManager::ProcessObj(..)
+const bool bXYRelHaveDefaultValues = pRecord-nXRelTo == 2
pRecord-nYRelTo == 2;
+if ( bXYRelHaveDefaultValues
+ nInTable 0
+ !bCurSectionVertical )
{
-// if nYRelTo differs from FSPA.nby overwrite nYRelTo
if ( pFSPA-nby != pRecord-nYRelTo )
{
pRecord-nYRelTo = pFSPA-nby;
}
}
-// --
- }
+}
sal_uInt32 nXRelTo = nCntRelTo pRecord-nXRelTo ? pRecord-nXRelTo : 1;
sal_uInt32 nYRelTo = nCntRelTo pRecord-nYRelTo ? pRecord-nYRelTo : 1;
svn propchange: r1616666 - svn:log
Author: steve_y Revision: 161 Modified property: svn:log Modified: svn:log at Fri Aug 8 03:12:17 2014 -- --- svn:log (original) +++ svn:log Fri Aug 8 03:12:17 2014 @@ -1,2 +1,2 @@ -https://issues.apache.org/ooo/show_bug.cgi?id=125391 +Issue 125391 - The textbox object's location changes after importing the sample file Fixed by Oliver-Rainer Wittmann
svn commit: r1615038 - /openoffice/test/test-data/testlink_samples/AOOTest-330.ods
Author: steve_y Date: Fri Aug 1 05:41:46 2014 New Revision: 1615038 URL: http://svn.apache.org/r1615038 Log: (empty) Added: openoffice/test/test-data/testlink_samples/AOOTest-330.ods (with props) Added: openoffice/test/test-data/testlink_samples/AOOTest-330.ods URL: http://svn.apache.org/viewvc/openoffice/test/test-data/testlink_samples/AOOTest-330.ods?rev=1615038view=auto == Binary file - no diff available. Propchange: openoffice/test/test-data/testlink_samples/AOOTest-330.ods -- svn:mime-type = application/octet-stream
svn commit: r1615039 - /openoffice/test/test-data/testlink_samples/AOOTest-379.ods
Author: steve_y Date: Fri Aug 1 05:42:16 2014 New Revision: 1615039 URL: http://svn.apache.org/r1615039 Log: (empty) Added: openoffice/test/test-data/testlink_samples/AOOTest-379.ods (with props) Added: openoffice/test/test-data/testlink_samples/AOOTest-379.ods URL: http://svn.apache.org/viewvc/openoffice/test/test-data/testlink_samples/AOOTest-379.ods?rev=1615039view=auto == Binary file - no diff available. Propchange: openoffice/test/test-data/testlink_samples/AOOTest-379.ods -- svn:mime-type = application/octet-stream
svn commit: r1607520 - in /openoffice/trunk/main/writerfilter/source/dmapper: CellColorHandler.cxx CellColorHandler.hxx DomainMapper.cxx
Author: steve_y
Date: Thu Jul 3 02:52:17 2014
New Revision: 1607520
URL: http://svn.apache.org/r1607520
Log:
Issue 119044 - Highlighter from DOCX file not imported correctly
Modified:
openoffice/trunk/main/writerfilter/source/dmapper/CellColorHandler.cxx
openoffice/trunk/main/writerfilter/source/dmapper/CellColorHandler.hxx
openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx
Modified: openoffice/trunk/main/writerfilter/source/dmapper/CellColorHandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/CellColorHandler.cxx?rev=1607520r1=1607519r2=1607520view=diff
==
--- openoffice/trunk/main/writerfilter/source/dmapper/CellColorHandler.cxx
(original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/CellColorHandler.cxx Thu
Jul 3 02:52:17 2014
@@ -44,7 +44,7 @@ LoggedProperties(dmapper_logger, CellCo
m_nShadowType( 0 ),
m_nColor( 0x ),
m_nFillColor( 0x ),
-m_bParagraph( false )
+m_eType( Others )
{
}
/*-- 24.04.2007 09:06:35---
@@ -224,9 +224,23 @@ TablePropertyMapPtr CellColorHandler::g
nApplyColor = ( (nRed/1000) 0x10 ) + ((nGreen/1000) 8) +
nBlue/1000;
}
-
-pPropertyMap-Insert( m_bParagraph ? PROP_PARA_BACK_COLOR :
PROP_BACK_COLOR, false,
-uno::makeAny( nApplyColor ));
+
+ sal_Int32 objType = PROP_CHAR_BACK_COLOR;
+
+ switch(m_eType)
+ {
+ case P:
+ pPropertyMap-Insert( PROP_PARA_BACK_COLOR, false,
uno::makeAny( nApplyColor ));
+ break;
+ case C:
+ pPropertyMap-Insert( PROP_CHAR_BACK_COLOR, false,
uno::makeAny( nApplyColor ));
+ break;
+ case Others:
+ default:
+ pPropertyMap-Insert( PROP_BACK_COLOR, false, uno::makeAny(
nApplyColor ));
+ break;
+ }
+
return pPropertyMap;
}
} //namespace dmapper
Modified: openoffice/trunk/main/writerfilter/source/dmapper/CellColorHandler.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/CellColorHandler.hxx?rev=1607520r1=1607519r2=1607520view=diff
==
--- openoffice/trunk/main/writerfilter/source/dmapper/CellColorHandler.hxx
(original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/CellColorHandler.hxx Thu
Jul 3 02:52:17 2014
@@ -39,7 +39,8 @@ public:
sal_Int32 m_nShadowType;
sal_Int32 m_nColor;
sal_Int32 m_nFillColor;
-bool m_bParagraph;
+ enum Type {P, C, Others};
+ Type m_eType;
private:
// Properties
@@ -52,7 +53,7 @@ public:
::boost::shared_ptrTablePropertyMapgetProperties();
-void setParagraph() { m_bParagraph = true; }
+void setType(Type type) { m_eType = type; }
};
typedef boost::shared_ptr CellColorHandler CellColorHandlerPtr;
}}
Modified: openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx?rev=1607520r1=1607519r2=1607520view=diff
==
--- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx
(original)
+++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper.cxx Thu Jul
3 02:52:17 2014
@@ -2617,7 +2617,7 @@ void DomainMapper::sprmWithProps( Sprm
if( pProperties.get())
{
CellColorHandlerPtr pCellColorHandler( new CellColorHandler );
-pCellColorHandler-setParagraph();
+ pCellColorHandler-setType(CellColorHandler::P);
pProperties-resolve(*pCellColorHandler);
rContext-insert( pCellColorHandler-getProperties(), true );
}
@@ -3186,6 +3186,16 @@ void DomainMapper::sprmWithProps( Sprm
break; // sprmCBrc
case NS_sprm::LN_CShd:
/* WRITERFILTERSTATUS: done: 0, planned: 0, spent: 0 */
+ {
+ writerfilter::ReferenceProperties::Pointer_t
pProperties = rSprm.getProps();
+ if( pProperties.get())
+ {
+ CellColorHandlerPtr pCellColorHandler( new
CellColorHandler );
+ pCellColorHandler-setType(CellColorHandler::C);
+ pProperties-resolve(*pCellColorHandler);
+ rContext-insert(
pCellColorHandler-getProperties(), true );
+ }
+}
break; // sprmCShd
case NS_sprm::LN_CIdslRMarkDel:
/* WRITERFILTERSTATUS: done: 0, planned: 2, spent: 0 */
svn commit: r1606622 - /openoffice/trunk/test/testgui/source/bvt/gui/FileExport.java
Author: steve_y
Date: Mon Jun 30 05:33:55 2014
New Revision: 1606622
URL: http://svn.apache.org/r1606622
Log:
A file conversion test case, which includes some operations of ODF, MS OOXML,
MS binary loading/saving, and PDF format exporting.
Added:
openoffice/trunk/test/testgui/source/bvt/gui/FileExport.java
Added: openoffice/trunk/test/testgui/source/bvt/gui/FileExport.java
URL:
http://svn.apache.org/viewvc/openoffice/trunk/test/testgui/source/bvt/gui/FileExport.java?rev=1606622view=auto
==
--- openoffice/trunk/test/testgui/source/bvt/gui/FileExport.java (added)
+++ openoffice/trunk/test/testgui/source/bvt/gui/FileExport.java Mon Jun 30
05:33:55 2014
@@ -0,0 +1,661 @@
+/**
+ *
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * 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.
+ *
+ */
+
+/**
+ *
+ */
+package bvt.gui;
+
+import static org.openoffice.test.common.Testspace.*;
+import static testlib.gui.AppTool.*;
+import static testlib.gui.UIMap.*;
+
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.concurrent.TimeoutException;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.InputStreamReader;
+import java.lang.RuntimeException;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openoffice.test.common.Condition;
+import org.openoffice.test.common.DataSheet;
+import org.openoffice.test.common.FileUtil;
+import org.openoffice.test.common.Logger;
+import org.openoffice.test.common.Testspace;
+import org.openoffice.test.vcl.widgets.VclDialog;
+
+/**
+ *
+ */
+class TestType {
+
+ public TestType(boolean doc, boolean spread, boolean slide) {
+ documentT = doc;
+ spreadsheetT = spread;
+ slideT = slide;
+ }
+
+ public boolean documentT;
+ public boolean spreadsheetT;
+ public boolean slideT;
+};
+
+class ContinuePoint {
+ public String path;
+ public int i;
+
+ ContinuePoint() {
+ path = ;
+ i = 0;
+ }
+}
+
+public class FileExport {
+ // for example
+ // the path is D:\\aoo\\utaoo\\testspace\\ooxmlsamples
+ String samplespath = ;// a dir
+ String outpath = ; // a dir
+ static double timeout = 100;
+ static double interval = 0.1;
+ double sleeptime = 1;
+ boolean bContinue = false;// if failed,next execute from the continue
point
+ TestType atest = new TestType(true, true, true);// doc,spreadsheet,slide
+ ContinuePoint thepoint = null;
+ BufferedWriter fwContinue = null;
+ String testedlogfile = ;
+
+ private static DataSheet result;
+ private String scenario = null;
+ private File sourceFile = null;
+
+ public static final VclDialog passwdDlg = dialog();
+
+ public ListString recursionfiles(File path, ListString
resultFileName) {
+ File[] files = path.listFiles();
+ if (files == null)
+ return resultFileName;
+ for (File f : files) {
+ if (f.isDirectory()) {// a path
+ if (!f.isHidden()
!f.getName().startsWith(.)) {
+ sampledirs.add(f.getPath());
+ recursionfiles(f, resultFileName);
+ }
+ } else {// a file
+ if (!f.isHidden()
!f.getName().startsWith(.)) {
+ String apath = f.getPath();
+
+ int sepIndex = apath.indexOf(\\);
+ String userpath =
apath.substring(sepIndex);
+ String newpath = outpath + userpath;
+
+ File file = new
svn commit: r1605015 - /openoffice/trunk/main/sd/source/core/stlpool.cxx
Author: steve_y
Date: Tue Jun 24 06:43:14 2014
New Revision: 1605015
URL: http://svn.apache.org/r1605015
Log:
Issue 125090 - The values of upper and lower spacing for default paragraph did
the complete opposite.
Modified:
openoffice/trunk/main/sd/source/core/stlpool.cxx
Modified: openoffice/trunk/main/sd/source/core/stlpool.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sd/source/core/stlpool.cxx?rev=1605015r1=1605014r2=1605015view=diff
==
--- openoffice/trunk/main/sd/source/core/stlpool.cxx (original)
+++ openoffice/trunk/main/sd/source/core/stlpool.cxx Tue Jun 24 06:43:14 2014
@@ -264,14 +264,14 @@ void SdStyleSheetPool::CreateLayoutStyle
sal_uLong nFontSize = 20;
short nFirstIndent = -600;
// sal_uInt16 nIndent = nLevel * 1200;
- sal_uInt16 nLower = 100;
+ sal_uInt16 nUpper = 100;
switch (nLevel)
{
case 1:
{
nFontSize = 32;
- nLower = 500;
+ nUpper = 500;
nFirstIndent = -900;
}
break;
@@ -279,7 +279,7 @@ void SdStyleSheetPool::CreateLayoutStyle
case 2:
{
nFontSize = 28;
- nLower = 400;
+ nUpper = 400;
nFirstIndent = -800;
}
break;
@@ -287,13 +287,13 @@ void SdStyleSheetPool::CreateLayoutStyle
case 3:
{
nFontSize = 24;
- nLower = 300;
+ nUpper = 300;
}
break;
case 4:
{
- nLower = 200;
+ nUpper = 200;
}
break;
}
@@ -314,7 +314,7 @@ void SdStyleSheetPool::CreateLayoutStyle
pSheet-GetItemSet().Put(aSvxLRSpaceItem);
*/
// Zeilendurchschuss (Abstand nach unten)
- aSvxULSpaceItem.SetLower(nLower);
+ aSvxULSpaceItem.SetUpper(nUpper);
pSheet-GetItemSet().Put(aSvxULSpaceItem);
/* i35937
svn commit: r1595419 - /openoffice/trunk/main/sal/osl/w32/path_helper.hxx
Author: steve_y
Date: Sat May 17 02:40:22 2014
New Revision: 1595419
URL: http://svn.apache.org/r1595419
Log:
i124896 add including of rtl/alloc.h in path_helper.hxx for win32
Modified:
openoffice/trunk/main/sal/osl/w32/path_helper.hxx
Modified: openoffice/trunk/main/sal/osl/w32/path_helper.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/w32/path_helper.hxx?rev=1595419r1=1595418r2=1595419view=diff
==
--- openoffice/trunk/main/sal/osl/w32/path_helper.hxx (original)
+++ openoffice/trunk/main/sal/osl/w32/path_helper.hxx Sat May 17 02:40:22 2014
@@ -30,6 +30,7 @@
#include path_helper.h
#include rtl/ustring.hxx
+#include rtl/alloc.h
namespace osl
{
svn propchange: r1589951 - svn:log
Author: steve_y Revision: 1589951 Modified property: svn:log Modified: svn:log at Mon Apr 28 03:29:12 2014 -- --- svn:log (original) +++ svn:log Mon Apr 28 03:29:12 2014 @@ -1,3 +1,3 @@ -https://issues.apache.org/ooo/show_bug.cgi?id=116796 +Issue 124755 - Cannot hide the shapes from master page when importing the sample pptx Added IsBackgroundObjectsVisible property support for sd OOXML importing
svn commit: r1589951 - in /openoffice/trunk/main/oox/source: ppt/slidefragmenthandler.cxx token/properties.txt
Author: steve_y
Date: Fri Apr 25 08:19:47 2014
New Revision: 1589951
URL: http://svn.apache.org/r1589951
Log:
https://issues.apache.org/ooo/show_bug.cgi?id=116796
Added IsBackgroundObjectsVisible property support for sd OOXML importing
Modified:
openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx
openoffice/trunk/main/oox/source/token/properties.txt
Modified: openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx?rev=1589951r1=1589950r2=1589951view=diff
==
--- openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx (original)
+++ openoffice/trunk/main/oox/source/ppt/slidefragmenthandler.cxx Fri Apr 25
08:19:47 2014
@@ -77,19 +77,32 @@ Reference XFastContextHandler SlideFr
switch( aElementToken )
{
- case PPT_TOKEN( sldMaster ):// CT_SlideMaster
- case PPT_TOKEN( handoutMaster ):// CT_HandoutMaster
- case PPT_TOKEN( sld ): // CT_CommonSlideData
+ case PPT_TOKEN( sld ): // CT_Slide
{
- AttributeList attribs( xAttribs );
-
- Reference XDrawPage xSlide( mpSlidePersistPtr-getPage() );
- PropertyMap aPropMap;
- PropertySet aSlideProp( xSlide );
+ OptValue bool aShowMasterSp = aAttribs.getBool(
XML_showMasterSp );
+ if( aShowMasterSp.has() !aShowMasterSp.get() )
+ {
+ PropertyMap aPropMap;
+ aPropMap[ PROP_IsBackgroundObjectsVisible ] = Any(
false );
- aPropMap[ PROP_Visible ] = Any( attribs.getBool( XML_show, sal_True
) );
- aSlideProp.setProperties( aPropMap );
+ Reference XDrawPage xSlide(
mpSlidePersistPtr-getPage() );
+ PropertySet aSlideProp( xSlide );
+ aSlideProp.setProperties( aPropMap );
+ }
+ }
+ case PPT_TOKEN( sldMaster ):// CT_SlideMaster
+ case PPT_TOKEN( handoutMaster ):// CT_HandoutMaster
+ {
+ OptValue bool aShow = aAttribs.getBool( XML_show );
+ if( aShow.has() !aShow.get() )
+ {
+ PropertyMap aPropMap;
+ aPropMap[ PROP_Visible ] = Any( false );
+ Reference XDrawPage xSlide(
mpSlidePersistPtr-getPage() );
+ PropertySet aSlideProp( xSlide );
+ aSlideProp.setProperties( aPropMap );
+ }
break;
}
case PPT_TOKEN( notes ):// CT_NotesSlide
Modified: openoffice/trunk/main/oox/source/token/properties.txt
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/token/properties.txt?rev=1589951r1=1589950r2=1589951view=diff
==
--- openoffice/trunk/main/oox/source/token/properties.txt (original)
+++ openoffice/trunk/main/oox/source/token/properties.txt Fri Apr 25 08:19:47
2014
@@ -221,6 +221,7 @@ InputMessage
InputTitle
IsActive
IsAdjustHeightEnabled
+IsBackgroundObjectsVisible
IsCaseSensitive
IsCellBackgroundTransparent
IsChangeReadOnlyEnabled
svn commit: r1587823 - /openoffice/trunk/main/filter/source/msfilter/escherex.cxx
Author: steve_y
Date: Wed Apr 16 07:48:58 2014
New Revision: 1587823
URL: http://svn.apache.org/r1587823
Log:
Issue 124661 - crash when loading and re-saving attached ppt file with a single
customshape
Modified:
openoffice/trunk/main/filter/source/msfilter/escherex.cxx
Modified: openoffice/trunk/main/filter/source/msfilter/escherex.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/msfilter/escherex.cxx?rev=1587823r1=1587822r2=1587823view=diff
==
--- openoffice/trunk/main/filter/source/msfilter/escherex.cxx (original)
+++ openoffice/trunk/main/filter/source/msfilter/escherex.cxx Wed Apr 16
07:48:58 2014
@@ -2558,7 +2558,7 @@ void ConvertEnhancedCustomShapeEquation(
if ( pAny )
*pAny = sEquationSource;
sal_Int32 nEquationSourceCount = sEquationSource.getLength();
- if ( nEquationSourceCount )
+ if ( nEquationSourceCount (nEquationSourceCount = 128) )
{
sal_Int32 i;
for ( i = 0; i nEquationSourceCount; i++ )
svn commit: r1587496 - /openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx
Author: steve_y
Date: Tue Apr 15 10:12:14 2014
New Revision: 1587496
URL: http://svn.apache.org/r1587496
Log:
Issue 124661 - crash when loading and re-saving attached ppt file with a single
customshape
check the equation array element number. If the number is greater than 128, the
equation array will not be imported.
Modified:
openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx
Modified: openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx?rev=1587496r1=1587495r2=1587496view=diff
==
--- openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx (original)
+++ openoffice/trunk/main/filter/source/msfilter/msdffimp.cxx Tue Apr 15
10:12:14 2014
@@ -1996,20 +1996,23 @@ void DffPropertyReader::ApplyCustomShape
if ( SeekToContent( DFF_Prop_pFormulas, rIn ) )
rIn nNumElem nNumElemMem nElemSize;
- sal_Int16 nP1, nP2, nP3;
- sal_uInt16 nFlags;
-
- uno::Sequence rtl::OUString aEquations( nNumElem );
- for ( i = 0; i nNumElem; i++ )
+ if ( nNumElem = 128 )
{
- rIn nFlags nP1 nP2 nP3;
- aEquations[ i ] = EnhancedCustomShape2d::GetEquation(
nFlags, nP1, nP2, nP3 );
+ sal_Int16 nP1, nP2, nP3;
+ sal_uInt16 nFlags;
+
+ uno::Sequence rtl::OUString aEquations( nNumElem );
+ for ( i = 0; i nNumElem; i++ )
+ {
+ rIn nFlags nP1 nP2 nP3;
+ aEquations[ i ] =
EnhancedCustomShape2d::GetEquation( nFlags, nP1, nP2, nP3 );
+ }
+ // pushing the whole Equations element
+ const rtl::OUString sEquations(
RTL_CONSTASCII_USTRINGPARAM ( Equations ) );
+ aProp.Name = sEquations;
+ aProp.Value = aEquations;
+ aPropVec.push_back( aProp );
}
- // pushing the whole Equations element
- const rtl::OUString sEquations( RTL_CONSTASCII_USTRINGPARAM
( Equations ) );
- aProp.Name = sEquations;
- aProp.Value = aEquations;
- aPropVec.push_back( aProp );
}
svn commit: r1583887 - in /openoffice/trunk/main/vcl: source/app/svapp.cxx source/app/svdata.cxx win/source/window/salframe.cxx
Author: steve_y
Date: Wed Apr 2 06:08:41 2014
New Revision: 1583887
URL: http://svn.apache.org/r1583887
Log:
Issue 124573 - Office does not start when accessibility is activated.
Fixed access bridge initialization issue in vcl.
Modified:
openoffice/trunk/main/vcl/source/app/svapp.cxx
openoffice/trunk/main/vcl/source/app/svdata.cxx
openoffice/trunk/main/vcl/win/source/window/salframe.cxx
Modified: openoffice/trunk/main/vcl/source/app/svapp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/svapp.cxx?rev=1583887r1=1583886r2=1583887view=diff
==
--- openoffice/trunk/main/vcl/source/app/svapp.cxx (original)
+++ openoffice/trunk/main/vcl/source/app/svapp.cxx Wed Apr 2 06:08:41 2014
@@ -2058,12 +2058,13 @@ sal_Bool Application::IsAccessibilityEna
sal_Bool InitAccessBridge( sal_Bool bShowCancel, sal_Bool rCancelled )
{
-sal_Bool bRet = true;
+sal_Bool bRet = sal_True;
+
+ rCancelled = sal_False;
// Disable Java bridge on UNIX and OS/2
#ifndef WNT
(void) bShowCancel; // unsued
-(void) rCancelled; // unused
#else
// Checking HasAtHook() was introduced with IBM's IA2 CWS.
if( HasAtHook() )
Modified: openoffice/trunk/main/vcl/source/app/svdata.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/svdata.cxx?rev=1583887r1=1583886r2=1583887view=diff
==
--- openoffice/trunk/main/vcl/source/app/svdata.cxx (original)
+++ openoffice/trunk/main/vcl/source/app/svdata.cxx Wed Apr 2 06:08:41 2014
@@ -442,7 +442,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
{
rCancelled = sal_False;
-bool bErrorMessage = true;
+sal_Bool bErrorMessage = sal_True;
// Note:
// if bAllowCancel is sal_True we were called from application startup
@@ -452,13 +452,13 @@ bool ImplInitAccessBridge(sal_Bool bAllo
try
{
-bool bSuccess = true;
+sal_Bool bSuccess = sal_True;
// No error messages when env var is set ..
static const char* pEnv = getenv(SAL_ACCESSIBILITY_ENABLED );
if( pEnv *pEnv )
{
-bErrorMessage = false;
+bErrorMessage = sal_False;
}
ImplSVData* pSVData = ImplGetSVData();
@@ -479,7 +479,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
}
if( !pSVData-mxAccessBridge.is() )
-bSuccess = false;
+bSuccess = sal_False;
return bSuccess;
#endif
css::uno::Reference XExtendedToolkit xToolkit =
@@ -512,7 +512,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
}
if( !pSVData-mxAccessBridge.is() )
-bSuccess = false;
+bSuccess = sal_False;
}
}
@@ -541,7 +541,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
rCancelled = sal_True;
}
-return false;
+return sal_False;
}
catch(::com::sun::star::java::JavaVMCreationFailureException)
@@ -566,7 +566,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
rCancelled = sal_True;
}
-return false;
+return sal_False;
}
catch(::com::sun::star::java::MissingJavaRuntimeException)
@@ -591,7 +591,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
rCancelled = sal_True;
}
-return false;
+return sal_False;
}
catch(::com::sun::star::java::JavaDisabledException)
@@ -616,7 +616,7 @@ bool ImplInitAccessBridge(sal_Bool bAllo
rCancelled = sal_True;
}
-return false;
+return sal_False;
}
@@ -670,12 +670,12 @@ bool ImplInitAccessBridge(sal_Bool bAllo
}
}
-return false;
+return sal_False;
}
catch (...)
{
-return false;
+return sal_False;
}
}
Modified: openoffice/trunk/main/vcl/win/source/window/salframe.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/win/source/window/salframe.cxx?rev=1583887r1=1583886r2=1583887view=diff
==
--- openoffice/trunk/main/vcl/win/source/window/salframe.cxx (original)
+++ openoffice/trunk/main/vcl/win/source/window/salframe.cxx Wed Apr 2
06:08:41 2014
@@ -6211,7 +6211,7 @@ LRESULT CALLBACK SalFrameWndProc( HWND h
// Make sure to launch
Accessibiliity only the following criterias are satisfied to avoid RFT
interrupts regular acc processing
if (g_acc_manager1 == NULL
svn commit: r1576192 - /openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
Author: steve_y
Date: Tue Mar 11 05:53:58 2014
New Revision: 1576192
URL: http://svn.apache.org/r1576192
Log:
Bug 123622 - [ia2] Calc: No focus event fired on cell when new spreadsheet is
created
Modified:
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
Modified:
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx?rev=1576192r1=1576191r2=1576192view=diff
==
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
(original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx Tue
Mar 11 05:53:58 2014
@@ -1647,10 +1647,12 @@ void ScAccessibleDocument::Notify( SfxBr
aEvent.EventId =
AccessibleEventId::BOUNDRECT_CHANGED;
aEvent.Source = uno::Reference
XAccessibleContext (this);
- CommitChange(aEvent);
+ CommitChange(aEvent);
if (mpAccessibleSpreadsheet)
mpAccessibleSpreadsheet-BoundingBoxChanged();
+ if (mpAccessibleSpreadsheet
mpViewShell-IsActive())
+
mpAccessibleSpreadsheet-FireFirstCellFocus();
}
else if (mpAccessibleSpreadsheet)
{
@@ -2266,7 +2268,6 @@ uno::Reference XAccessible
mpAccessibleSpreadsheet-acquire();
mpAccessibleSpreadsheet-Init();
mbCompleteSheetSelected = IsTableSelected();
- mpAccessibleSpreadsheet-FireFirstCellFocus(); // i123622
}
return mpAccessibleSpreadsheet;
}
svn commit: r1568219 - in /openoffice/trunk/main/sc: inc/document.hxx source/core/data/documen3.cxx source/ui/unoobj/nameuno.cxx
Author: steve_y
Date: Fri Feb 14 08:44:17 2014
New Revision: 1568219
URL: http://svn.apache.org/r1568219
Log:
Bug 124065 - [Performance] Low performance opening attached .ods
Modified:
openoffice/trunk/main/sc/inc/document.hxx
openoffice/trunk/main/sc/source/core/data/documen3.cxx
openoffice/trunk/main/sc/source/ui/unoobj/nameuno.cxx
Modified: openoffice/trunk/main/sc/inc/document.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/document.hxx?rev=1568219r1=1568218r2=1568219view=diff
==
--- openoffice/trunk/main/sc/inc/document.hxx (original)
+++ openoffice/trunk/main/sc/inc/document.hxx Fri Feb 14 08:44:17 2014
@@ -503,6 +503,7 @@ public:
ScFieldEditEngine* CreateFieldEditEngine();
void
DisposeFieldEditEngine(ScFieldEditEngine* rpEditEngine);
+ // Note: the returned ScRangeName is volatile, and it can be changed at
any time.
SC_DLLPUBLIC ScRangeName* GetRangeName();
voidSetRangeName( ScRangeName* pNewRangeName );
SCTAB GetMaxTableNumber() { return nMaxTableNumber; }
Modified: openoffice/trunk/main/sc/source/core/data/documen3.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/documen3.cxx?rev=1568219r1=1568218r2=1568219view=diff
==
--- openoffice/trunk/main/sc/source/core/data/documen3.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/documen3.cxx Fri Feb 14 08:44:17
2014
@@ -95,6 +95,9 @@ ScRangeName* ScDocument::GetRangeName()
void ScDocument::SetRangeName( ScRangeName* pNewRangeName )
{
+ if (pRangeName == pNewRangeName)
+ return;
+
if (pRangeName)
delete pRangeName;
pRangeName = pNewRangeName;
Modified: openoffice/trunk/main/sc/source/ui/unoobj/nameuno.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/unoobj/nameuno.cxx?rev=1568219r1=1568218r2=1568219view=diff
==
--- openoffice/trunk/main/sc/source/ui/unoobj/nameuno.cxx (original)
+++ openoffice/trunk/main/sc/source/ui/unoobj/nameuno.cxx Fri Feb 14 08:44:17
2014
@@ -159,8 +159,7 @@ void ScNamedRangeObj::Modify_Impl( const
else if (!pNewScopeName
|| *pNewScopeName == EMPTY_STRING )
newNameScope =
nameScope;
//end of add
-
-ScRangeName* pNewRanges = new ScRangeName( *pNames
);
+
ScRangeData* pOld = (*pNames)[nPos];
String aInsName(pOld-GetName());
@@ -184,20 +183,40 @@ void ScNamedRangeObj::Modify_Impl( const
pNew = new ScRangeData( pDoc, aInsName,
aContent, aPos, nType, eGrammar );
pNew-SetIndex( pOld-GetIndex() );
pNew-SetRangeScope(newNameScope);
-
-pNewRanges-AtFree( nPos );
-if ( pNewRanges-Insert(pNew) )
-{
- ScDocFunc aFunc(*pDocShell);
- aFunc.SetNewRangeNames( pNewRanges, sal_True
);
- aName = aInsName; //! broadcast?
- aScopeName = pNewScopeName ? *pNewScopeName :
aScopeName;
-}
-else
-{
- delete pNew; //!
uno::Exception/Fehler oder so
- delete pNewRanges;
-}
+
+ const bool
bSupportUndo(!pDoc-IsImportingXML());
+ if ( bSupportUndo )
+ {
+ ScRangeName*
pNewRanges = new ScRangeName( *pNames );
+
pNewRanges-AtFree( nPos );
+ if (
pNewRanges-Insert(pNew) )
+ {
+
ScDocFunc aFunc(*pDocShell);
+
aFunc.SetNewRangeNames( pNewRanges, sal_True );
+aName
= aInsName; //! broadcast
svn commit: r1562022 - in /openoffice/trunk/main: accessibility/source/standard/vclxaccessiblebox.cxx accessibility/source/standard/vclxaccessiblelist.cxx vcl/inc/vcl/vclevent.hxx vcl/source/control/c
Author: steve_y
Date: Tue Jan 28 09:55:07 2014
New Revision: 1562022
URL: http://svn.apache.org/r1562022
Log:
Bug 124008 - listbox entry's are selected automatically on mouse over instead
of mouse click
Modified:
openoffice/trunk/main/accessibility/source/standard/vclxaccessiblebox.cxx
openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx
openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx
openoffice/trunk/main/vcl/source/control/combobox.cxx
openoffice/trunk/main/vcl/source/control/lstbox.cxx
Modified:
openoffice/trunk/main/accessibility/source/standard/vclxaccessiblebox.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/standard/vclxaccessiblebox.cxx?rev=1562022r1=1562021r2=1562022view=diff
==
--- openoffice/trunk/main/accessibility/source/standard/vclxaccessiblebox.cxx
(original)
+++ openoffice/trunk/main/accessibility/source/standard/vclxaccessiblebox.cxx
Tue Jan 28 09:55:07 2014
@@ -116,6 +116,7 @@ void VCLXAccessibleBox::ProcessWindowEve
{
switch ( rVclWindowEvent.GetId() )
{
+ case VCLEVENT_DROPDOWN_SELECT:
case VCLEVENT_LISTBOX_SELECT:
case VCLEVENT_LISTBOX_FOCUSITEMCHANGED:
Modified:
openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx?rev=1562022r1=1562021r2=1562022view=diff
==
--- openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx
(original)
+++ openoffice/trunk/main/accessibility/source/standard/vclxaccessiblelist.cxx
Tue Jan 28 09:55:07 2014
@@ -363,6 +363,7 @@ void VCLXAccessibleList::ProcessWindowEv
{
switch ( rVclWindowEvent.GetId() )
{
+ case VCLEVENT_DROPDOWN_SELECT:
case VCLEVENT_LISTBOX_SELECT:
if ( !m_bDisableProcessEvent )
UpdateSelection_Impl_Acc(b_IsDropDownList);
Modified: openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx?rev=1562022r1=1562021r2=1562022view=diff
==
--- openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx Tue Jan 28 09:55:07 2014
@@ -154,6 +154,7 @@ namespace com { namespace sun { namespac
#define VCLEVENT_ITEM_COLLAPSED 1175
// --
#define VCLEVENT_DROPDOWN_PRE_OPEN 1176
+#define VCLEVENT_DROPDOWN_SELECT 1177
#define VCLEVENT_LISTBOX_FOCUSITEMCHANGED 1180
// #define VCLEVENT_EDIT_CARETCHANGED // IA2 CWS. MT:
VCL only has selection API - difference for selection_changed vs. caret_changed
is handled in accessibility wrapper since OOo 3.2
Modified: openoffice/trunk/main/vcl/source/control/combobox.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/control/combobox.cxx?rev=1562022r1=1562021r2=1562022view=diff
==
--- openoffice/trunk/main/vcl/source/control/combobox.cxx (original)
+++ openoffice/trunk/main/vcl/source/control/combobox.cxx Tue Jan 28 09:55:07
2014
@@ -475,7 +475,7 @@ IMPL_LINK( ComboBox, ImplSelectHdl, void
}
IMPL_LINK( ComboBox, ImplListItemSelectHdl, void*, EMPTYARG )
{
-ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
+ImplCallEventListeners( VCLEVENT_DROPDOWN_SELECT );
return 1;
}
// ---
Modified: openoffice/trunk/main/vcl/source/control/lstbox.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/control/lstbox.cxx?rev=1562022r1=1562021r2=1562022view=diff
==
--- openoffice/trunk/main/vcl/source/control/lstbox.cxx (original)
+++ openoffice/trunk/main/vcl/source/control/lstbox.cxx Tue Jan 28 09:55:07 2014
@@ -258,7 +258,7 @@ IMPL_LINK( ListBox, ImplFocusHdl, void *
}
IMPL_LINK( ListBox, ImplListItemSelectHdl, void*, EMPTYARG )
{
-ImplCallEventListeners( VCLEVENT_LISTBOX_SELECT );
+ImplCallEventListeners( VCLEVENT_DROPDOWN_SELECT );
return 1;
}
svn commit: r1562371 - /openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx
Author: steve_y
Date: Wed Jan 29 07:19:56 2014
New Revision: 1562371
URL: http://svn.apache.org/r1562371
Log:
Bug 124021 - Data range dialog is broken
A side effect from IA2 integration.
Revert changes.
Modified:
openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx
Modified:
openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx?rev=1562371r1=1562370r2=1562371view=diff
==
--- openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx
(original)
+++ openoffice/trunk/main/chart2/source/controller/dialogs/tp_DataSource.cxx
Wed Jan 29 07:19:56 2014
@@ -69,7 +69,10 @@ const OUString lcl_aLabelRole( RTL_CONST
String lcl_GetRoleLBEntry(
const OUString rRole, const OUString rRange )
{
-String aEntry(::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
+String aEntry( rRole );
+aEntry += '\t';
+aEntry += String(
+::chart::DialogModel::ConvertRoleFromInternalToUI( rRole ));
aEntry += '\t';
aEntry += String( rRange );
@@ -137,8 +140,8 @@ OUString lcl_GetSequenceNameForLabel( ::
}
static long lcl_pRoleListBoxTabs[] =
- { 2,// Number of Tabs
- 0, 75
+{ 3,// Number of Tabs
+0, 0, 75
};
void lcl_ShowChooserButton(
svn commit: r1561632 - /openoffice/trunk/main/sw/source/core/access/accpara.cxx
Author: steve_y
Date: Mon Jan 27 10:52:11 2014
New Revision: 1561632
URL: http://svn.apache.org/r1561632
Log:
Bug 123745 - [IA2] Eventual crash in Writer documents containing
cross-references
Removed some unused lines and comments
Modified:
openoffice/trunk/main/sw/source/core/access/accpara.cxx
Modified: openoffice/trunk/main/sw/source/core/access/accpara.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/accpara.cxx?rev=1561632r1=1561631r2=1561632view=diff
==
--- openoffice/trunk/main/sw/source/core/access/accpara.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/accpara.cxx Mon Jan 27 10:52:11
2014
@@ -1898,11 +1898,11 @@ uno::SequencePropertyValue SwAccessibl
{
aValues.realloc( aValues.getLength() + 1 );
pValues = aValues.getArray();
- rValue = pValues[aValues.getLength() - 1];
- rValue.Name = OUString::createFromAscii(FieldType);
- rValue.Value =
rtl::OUString(strTypeName.ToLowerAscii());
- rValue.Handle = -1;
- rValue.State = PropertyState_DIRECT_VALUE;
+ PropertyValue rValueFT = pValues[aValues.getLength() -
1];
+ rValueFT.Name = OUString::createFromAscii(FieldType);
+ rValueFT.Value =
rtl::OUString(strTypeName.ToLowerAscii());
+ rValueFT.Handle = -1;
+ rValueFT.State = PropertyState_DIRECT_VALUE;
}
//sort property values
@@ -2368,9 +2368,6 @@ void SwAccessibleParagraph::_getSuppleme
tAccParaPropValMap aSupplementalAttrSeq;
{
-//const SfxItemPropertySet rPropSet =
-//aSwMapProvider.GetPropertyMap(
PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE );
-//const SfxItemPropertyMap* pPropMap( rPropSet.getPropertyMap() );
const SfxItemPropertyMapEntry* pPropMap(
aSwMapProvider.GetPropertyMapEntries(
PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE ) );
while ( pPropMap-pName )
@@ -3415,14 +3412,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
nCount++;
}
- /* Can't fin the function GetTOCFirstWordEndIndex declaration in
sym2.0 (Added by yanjun)
- if( GetTOXSortTabBase() )
- {
- SwTxtNode* pNode = const_castSwTxtNode*(GetTxtNode());
- if(pNode pNode-GetTOCFirstWordEndIndex() 0)
- nCount++;
- }
- */
return nCount;
}
@@ -3451,8 +3440,6 @@ uno::Reference XAccessibleHyperlink S
pNode = const_castSwTxtNode*(GetTxtNode());
}
nTOCEndIndex = -1;
- //if(pNode)
- // nTOCEndIndex = pNode-GetTOCFirstWordEndIndex();
SwTxtAttr* pHt = (SwTxtAttr*)(aHIter.next());
while( (nLinkIndex getHyperLinkCount()) nTIndex nLinkIndex)
{
@@ -3670,14 +3657,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
if( pHt )
nRet = nPos;
}
- /* Added by yanjun for acc miagration
- if( nRet == -1 GetTOXSortTabBase() )
- {
- SwTxtNode* pNode = const_castSwTxtNode*(GetTxtNode());
- if( nCharIndex = 0 nCharIndex
pNode-GetTOCFirstWordEndIndex())
- nRet = 0;
- }
- */
if (nRet == -1)
throw lang::IndexOutOfBoundsException();
@@ -4250,45 +4229,6 @@ sal_Int16 SAL_CALL SwAccessibleParagraph
}
}
-// End Add
-
-
-/* This funcion is already defined in accpara.cxx(Added by yanjun)
-sal_Int32 SAL_CALL SwAccessibleParagraph::getBackground()
- throw (::com::sun::star::uno::RuntimeException)
-{
-// Test Code
-// SequenceOUString seNames(1);
-// OUString* pStrings = seNames.getArray();
-// pStrings[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(ParaBackColor));
-//
-// SequenceAny aAnys(1);
-// ReferenceXMultiPropertySet xPortion = CreateUnoPortion( 0, 0 );
-// aAnys = xPortion-getPropertyValues( seNames );
-// const Any* pAnys = aAnys.getConstArray();
-//
-// sal_uInt32 crColorT=0;
-// pAnys[0] = crColorT;
-// End Test Code
-
- const SvxBrushItem rBack = GetFrm()-GetAttrSet()-GetBackground();
- sal_uInt32 crBack = rBack.GetColor().GetColor();
-
- if (COL_AUTO == crBack)
- {
- ReferenceXAccessible xAccDoc = getAccessibleParent();
- if (xAccDoc.is())
- {
- ReferenceXAccessibleComponent
xCompoentDoc(xAccDoc,UNO_QUERY);
- if (xCompoentDoc.is())
- {
- crBack =
(sal_uInt32)xCompoentDoc-getBackground
svn commit: r1561587 - /openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp
Author: steve_y
Date: Mon Jan 27 05:49:26 2014
New Revision: 1561587
URL: http://svn.apache.org/r1561587
Log:
Bug 124095 - Multiple IAccessible and IAccessible2 interface methods do not
check for NULL pointer access, nor do they trap exceptions
Fixed by Michael Curran
Modified:
openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp
Modified: openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp?rev=1561587r1=1561586r2=1561587view=diff
==
--- openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp
(original)
+++ openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp Mon
Jan 27 05:49:26 2014
@@ -353,8 +353,10 @@ STDMETHODIMP CMAccessible::get_accChild(
return S_OK;
}
*ppdispChild = GetChildInterface(varChild.lVal);
+ if((*ppdispChild) == NULL)
+ return E_FAIL;
(*ppdispChild)-AddRef();
- return (*ppdispChild)?S_OK:S_FALSE;
+ return S_OK;
}
return S_FALSE;
@@ -1653,6 +1655,7 @@ STDMETHODIMP CMAccessible::get_nRelation
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
+ ISDESTROY()
// #CHECK#
if(nRelations == NULL)
@@ -1748,6 +1751,7 @@ STDMETHODIMP CMAccessible::get_relations
CHECK_ENABLE_INF
ENTER_PROTECTED_BLOCK
+ ISDESTROY()
// #CHECK#
if(relation == NULL || nRelations == NULL)
@@ -3240,6 +3244,8 @@ STDMETHODIMP CMAccessible:: get_toolkitV
STDMETHODIMP CMAccessible::get_attributes(/*[out]*/ BSTR *pAttr)
{
+ ENTER_PROTECTED_BLOCK
+ ISDESTROY()
CHECK_ENABLE_INF
ReferenceXAccessibleContext pRContext =
pUNOInterface-getAccessibleContext();
if( !pRContext.is() )
@@ -3264,5 +3270,6 @@ STDMETHODIMP CMAccessible::get_attribute
return S_OK;
}
+ LEAVE_PROTECTED_BLOCK
}
svn commit: r1555701 - in /openoffice/trunk/main/sc/source/ui: Accessibility/AccessibleCell.cxx Accessibility/AccessibleDocument.cxx Accessibility/AccessibleSpreadsheet.cxx inc/AccessibleCell.hxx inc/
Author: steve_y
Date: Mon Jan 6 09:42:20 2014
New Revision: 1555701
URL: http://svn.apache.org/r1555701
Log:
Rolled back some coverity issue fixes for mac build
Modified:
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx
openoffice/trunk/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx
Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx?rev=1555701r1=1555700r2=1555701view=diff
==
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx
(original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx Mon Jan
6 09:42:20 2014
@@ -510,7 +510,7 @@ void ScAccessibleCell::AddRelation(const
}
uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
com::sun::star::ucb::CommandFailedException)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException)
{
uno::Any strRet;
if (mpViewShell)
Modified:
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx?rev=1555701r1=1555700r2=1555701view=diff
==
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
(original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx Mon
Jan 6 09:42:20 2014
@@ -257,12 +257,12 @@ public:
virtual ::accessibility::AccessibleControlShape*
GetAccControlShapeFromModel
(::com::sun::star::beans::XPropertySet* pSet)
- throw (::com::sun::star::uno::RuntimeException,
com::sun::star::ucb::CommandFailedException);
+ throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible
GetAccessibleCaption (const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape xShape)
- throw (::com::sun::star::uno::RuntimeException,
com::sun::star::ucb::CommandFailedException);
+ throw (::com::sun::star::uno::RuntimeException);
///= Internal
void SetDrawBroadcaster();
@@ -483,7 +483,7 @@ sal_Bool ScChildrenShapes::ReplaceChild
return bResult;
}
-::accessibility::AccessibleControlShape *
ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet*
pSet) throw (::com::sun::star::uno::RuntimeException,
com::sun::star::ucb::CommandFailedException)
+::accessibility::AccessibleControlShape *
ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet*
pSet) throw (::com::sun::star::uno::RuntimeException)
{
sal_Int32 count = GetCount();
for (sal_Int32 index=0;indexcount;index++)
@@ -504,7 +504,7 @@ sal_Bool ScChildrenShapes::ReplaceChild
}
::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible
ScChildrenShapes::GetAccessibleCaption (const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape xShape)
- throw (::com::sun::star::uno::RuntimeException,
com::sun::star::ucb::CommandFailedException)
+ throw (::com::sun::star::uno::RuntimeException)
{
sal_Int32 count = GetCount();
for (sal_Int32 index=0;indexcount;index++)
Modified:
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx?rev=1555701r1=1555700r2=1555701view=diff
==
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
(original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
Mon Jan 6 09:42:20 2014
@@ -1490,7 +1490,7 @@ Rectangle ScAccessibleSpreadsheet::GetVi
return Rectangle();
}
sal_Bool SAL_CALL ScAccessibleSpreadsheet::selectRow( sal_Int32 row )
- throw (lang::IndexOutOfBoundsException, uno::RuntimeException,
ucb::CommandFailedException, ucb::ContentCreationException)
+throw (lang::IndexOutOfBoundsException, uno::RuntimeException)
{
if (IsFormulaMode())
{
@@ -1506,7 +1506,7 @@ sal_Bool SAL_CALL
svn commit: r1556120 - /openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
Author: steve_y Date: Tue Jan 7 06:02:14 2014 New Revision: 1556120 URL: http://svn.apache.org/r1556120 Log: Bug 123622 - [ia2] Calc: No focus event fired on cell when new spreadsheet is created Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx?rev=1556120r1=1556119r2=1556120view=diff == --- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx (original) +++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx Tue Jan 7 06:02:14 2014 @@ -2266,6 +2266,7 @@ uno::Reference XAccessible mpAccessibleSpreadsheet-acquire(); mpAccessibleSpreadsheet-Init(); mbCompleteSheetSelected = IsTableSelected(); + mpAccessibleSpreadsheet-FireFirstCellFocus(); // i123622 } return mpAccessibleSpreadsheet; }
svn commit: r1555691 - /openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp
Author: steve_y Date: Mon Jan 6 07:08:05 2014 New Revision: 1555691 URL: http://svn.apache.org/r1555691 Log: Initialize m_containedObjects Modified: openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp Modified: openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp URL: http://svn.apache.org/viewvc/openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp?rev=1555691r1=1555690r2=1555691view=diff == --- openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp (original) +++ openoffice/trunk/main/winaccessibility/source/UAccCOM/MAccessible.cpp Mon Jan 6 07:08:05 2014 @@ -216,6 +216,7 @@ pUNOInterface(NULL) m_sLocation.m_dWidth=0; m_sLocation.m_dHeight=0; CEnumVariant::Create(m_pEnumVar); + m_containedObjects.clear(); } CMAccessible::~CMAccessible()
svn commit: r1555694 - in /openoffice/trunk/main/sc/source/ui: Accessibility/ inc/ view/
Author: steve_y
Date: Mon Jan 6 07:40:48 2014
New Revision: 1555694
URL: http://svn.apache.org/r1555694
Log:
Bug 123629 - [ia2] Calc: Invalid focus event fired after editing cell
Some Coverity issues fixes
Modified:
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx
openoffice/trunk/main/sc/source/ui/inc/AccessibleCell.hxx
openoffice/trunk/main/sc/source/ui/inc/AccessibleSpreadsheet.hxx
openoffice/trunk/main/sc/source/ui/inc/tabvwsh.hxx
openoffice/trunk/main/sc/source/ui/view/cellsh4.cxx
openoffice/trunk/main/sc/source/ui/view/tabview3.cxx
openoffice/trunk/main/sc/source/ui/view/tabvwsh4.cxx
Modified: openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx?rev=1555694r1=1555693r2=1555694view=diff
==
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx
(original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleCell.cxx Mon Jan
6 07:40:48 2014
@@ -510,7 +510,7 @@ void ScAccessibleCell::AddRelation(const
}
uno::Any SAL_CALL ScAccessibleCell::getExtendedAttributes()
- throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::lang::IndexOutOfBoundsException,
::com::sun::star::uno::RuntimeException,
com::sun::star::ucb::CommandFailedException)
{
uno::Any strRet;
if (mpViewShell)
Modified:
openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx?rev=1555694r1=1555693r2=1555694view=diff
==
--- openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx
(original)
+++ openoffice/trunk/main/sc/source/ui/Accessibility/AccessibleDocument.cxx Mon
Jan 6 07:40:48 2014
@@ -257,12 +257,12 @@ public:
virtual ::accessibility::AccessibleControlShape*
GetAccControlShapeFromModel
(::com::sun::star::beans::XPropertySet* pSet)
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
com::sun::star::ucb::CommandFailedException);
virtual ::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible
GetAccessibleCaption (const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape xShape)
- throw (::com::sun::star::uno::RuntimeException);
+ throw (::com::sun::star::uno::RuntimeException,
com::sun::star::ucb::CommandFailedException);
///= Internal
void SetDrawBroadcaster();
@@ -483,7 +483,7 @@ sal_Bool ScChildrenShapes::ReplaceChild
return bResult;
}
-::accessibility::AccessibleControlShape *
ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet*
pSet) throw (::com::sun::star::uno::RuntimeException)
+::accessibility::AccessibleControlShape *
ScChildrenShapes::GetAccControlShapeFromModel(::com::sun::star::beans::XPropertySet*
pSet) throw (::com::sun::star::uno::RuntimeException,
com::sun::star::ucb::CommandFailedException)
{
sal_Int32 count = GetCount();
for (sal_Int32 index=0;indexcount;index++)
@@ -504,7 +504,7 @@ sal_Bool ScChildrenShapes::ReplaceChild
}
::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessible
ScChildrenShapes::GetAccessibleCaption (const ::com::sun::star::uno::Reference
::com::sun::star::drawing::XShape xShape)
- throw (::com::sun::star::uno::RuntimeException)
+ throw (::com::sun::star::uno::RuntimeException,
com::sun::star::ucb::CommandFailedException)
{
sal_Int32 count = GetCount();
for (sal_Int32 index=0;indexcount;index++)
@@ -1014,10 +1014,13 @@ sal_Bool ScChildrenShapes::FindSelectedS
++aDataItr;
}
bool bWinFocus=false;
- ScGridWindow* pWin =
static_castScGridWindow*(mpViewShell-GetWindowByPos(meSplitPos));
- if (pWin)
+ if (mpViewShell)
{
- bWinFocus = pWin-HasFocus();
+ ScGridWindow* pWin =
static_castScGridWindow*(mpViewShell-GetWindowByPos(meSplitPos));
+ if (pWin)
+ {
+ bWinFocus = pWin-HasFocus();
+ }
}
const SdrMarkList* pMarkList = NULL;
SdrObject* pMarkedObj = NULL;
Modified:
openoffice/trunk/main/sc/source/ui/Accessibility
svn commit: r1555031 - in /openoffice/trunk/main/sc: inc/ source/core/data/
Author: steve_y
Date: Fri Jan 3 08:48:02 2014
New Revision: 1555031
URL: http://svn.apache.org/r1555031
Log:
Bug 123909 - Select one column, paste cell range with merged cell in, AOO will
be not responding
Modified:
openoffice/trunk/main/sc/inc/attarray.hxx
openoffice/trunk/main/sc/inc/column.hxx
openoffice/trunk/main/sc/inc/document.hxx
openoffice/trunk/main/sc/inc/table.hxx
openoffice/trunk/main/sc/source/core/data/attarray.cxx
openoffice/trunk/main/sc/source/core/data/column2.cxx
openoffice/trunk/main/sc/source/core/data/documen3.cxx
openoffice/trunk/main/sc/source/core/data/document.cxx
openoffice/trunk/main/sc/source/core/data/table4.cxx
Modified: openoffice/trunk/main/sc/inc/attarray.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/attarray.hxx?rev=1555031r1=1555030r2=1555031view=diff
==
--- openoffice/trunk/main/sc/inc/attarray.hxx (original)
+++ openoffice/trunk/main/sc/inc/attarray.hxx Fri Jan 3 08:48:02 2014
@@ -188,6 +188,11 @@ public:
voidDeleteHardAttr( SCROW nStartRow, SCROW nEndRow );
//UNUSED2008-05 voidConvertFontsAfterLoad(); // old binary file format
+
+/* i123909: Pre-calculate needed memory, and pre-reserve enough memory */
+boolReserve( SCSIZE nCount );
+SCSIZE Count() const{ return nCount; }
+SCSIZE Count( SCROW nRw1, SCROW nRw2 );
};
Modified: openoffice/trunk/main/sc/inc/column.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/column.hxx?rev=1555031r1=1555030r2=1555031view=diff
==
--- openoffice/trunk/main/sc/inc/column.hxx (original)
+++ openoffice/trunk/main/sc/inc/column.hxx Fri Jan 3 08:48:02 2014
@@ -404,6 +404,9 @@ public:
xub_StrLen GetMaxNumberStringLen( sal_uInt16 nPrecision,
SCROW nRowStart, SCROW nRowEnd ) const;
+SCSIZE GetPatternCount( );
+SCSIZE GetPatternCount( SCROW nRw1, SCROW nRw2 );
+boolReservedPatternCount( SCSIZE nReserved );
private:
ScBaseCell* CloneCell(SCSIZE nIndex, sal_uInt16 nFlags, ScDocument
rDestDoc, const ScAddress rDestPos);
//UNUSED2008-05 void CorrectSymbolCells( CharSet eStreamCharSet );
Modified: openoffice/trunk/main/sc/inc/document.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/document.hxx?rev=1555031r1=1555030r2=1555031view=diff
==
--- openoffice/trunk/main/sc/inc/document.hxx (original)
+++ openoffice/trunk/main/sc/inc/document.hxx Fri Jan 3 08:48:02 2014
@@ -1908,6 +1908,10 @@ private: // CLOOK-Impl-Methoden
public:
voidFillDPCache( ScDPTableDataCache * pCache, SCTAB nDocTab, SCCOL
nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow );
+private:
+SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol );
+SCSIZE GetPatternCount( SCTAB nTab, SCCOL nCol, SCROW nRw1, SCROW nRw2 );
+bool ReservedPatternCount( SCTAB nTab, SCCOL nCol, SCSIZE nReserved );
};
inline void ScDocument::GetSortParam( ScSortParam rParam, SCTAB nTab )
{
Modified: openoffice/trunk/main/sc/inc/table.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/inc/table.hxx?rev=1555031r1=1555030r2=1555031view=diff
==
--- openoffice/trunk/main/sc/inc/table.hxx (original)
+++ openoffice/trunk/main/sc/inc/table.hxx Fri Jan 3 08:48:02 2014
@@ -311,6 +311,9 @@ public:
SvNumberFormatter* pFormatter = NULL, bool
bDetectNumberFormat = true );
voidSetValue( SCCOL nCol, SCROW nRow, const double rVal );
voidSetError( SCCOL nCol, SCROW nRow, sal_uInt16 nError);
+ SCSIZE GetPatternCount( SCCOL nCol );
+ SCSIZE GetPatternCount( SCCOL nCol, SCROW nRw1, SCROW nRw2 );
+ boolReservedPatternCount( SCCOL nCol, SCSIZE nReserved );
voidGetString( SCCOL nCol, SCROW nRow, String rString );
voidFillDPCache( ScDPTableDataCache * pCache, SCCOL nStartCol, SCCOL
nEndCol, SCROW nStartRow, SCROW nEndRow );
Modified: openoffice/trunk/main/sc/source/core/data/attarray.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sc/source/core/data/attarray.cxx?rev=1555031r1=1555030r2=1555031view=diff
==
--- openoffice/trunk/main/sc/source/core/data/attarray.cxx (original)
+++ openoffice/trunk/main/sc/source/core/data/attarray.cxx Fri Jan 3 08:48:02
2014
@@ -295,6 +295,24 @@ void ScAttrArray::SetPattern( SCROW nRow
SetPatternArea( nRow, nRow, pPattern, bPutToPool );
}
+bool ScAttrArray::Reserve( SCSIZE nReserve )
+{
+if ( nCount = nReserve )
+{
+if( ScAttrEntry* pNewData = new
svn commit: r1554781 - /openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx
Author: steve_y Date: Thu Jan 2 10:17:34 2014 New Revision: 1554781 URL: http://svn.apache.org/r1554781 Log: Bug 119577 - [From Symphony] The file name field change to file name without extension in AOO 3.4 Modified: openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx Modified: openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx?rev=1554781r1=1554780r2=1554781view=diff == --- openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx (original) +++ openoffice/trunk/main/writerfilter/source/dmapper/DomainMapper_Impl.cxx Thu Jan 2 10:17:34 2014 @@ -3078,7 +3078,7 @@ void DomainMapper_Impl::CloseFieldComman sal_Int32 nNumberingTypeIndex = pContext-GetCommand().indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(\\p))); xFieldProperties-setPropertyValue( rPropNameSupplier.GetName(PROP_FILE_FORMAT), -uno::makeAny( nNumberingTypeIndex 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME )); +uno::makeAny( nNumberingTypeIndex 0 ? text::FilenameDisplayFormat::FULL : text::FilenameDisplayFormat::NAME_AND_EXT )); } break; case FIELD_FILESIZE : break;
svn commit: r1554783 - /openoffice/trunk/main/sw/source/core/unocore/unoidx.cxx
Author: steve_y
Date: Thu Jan 2 10:46:03 2014
New Revision: 1554783
URL: http://svn.apache.org/r1554783
Log:
Bug 119568 - [From Symphony] The page number of the TOC is not correct if open
the .docx via AOO
Modified:
openoffice/trunk/main/sw/source/core/unocore/unoidx.cxx
Modified: openoffice/trunk/main/sw/source/core/unocore/unoidx.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/unocore/unoidx.cxx?rev=1554783r1=1554782r2=1554783view=diff
==
--- openoffice/trunk/main/sw/source/core/unocore/unoidx.cxx (original)
+++ openoffice/trunk/main/sw/source/core/unocore/unoidx.cxx Thu Jan 2 10:46:03
2014
@@ -67,6 +67,7 @@
#include chpfld.hxx
#include SwStyleNameMapper.hxx
#include unoevtlstnr.hxx
+#include editsh.hxx
using namespace ::com::sun::star;
@@ -583,6 +584,21 @@ throw (uno::RuntimeException)
/*-- 14.12.98 09:35:05---
---*/
+void lcl_CalcLayout(SwDoc *pDoc)
+{
+ViewShell *pViewShell = 0;
+SwEditShell* pEditShell = pDoc ? pDoc-GetEditShell(pViewShell) : 0;
+if (pEditShell)
+{
+pEditShell-CalcLayout();
+}
+else if (pViewShell)
+{
+pViewShell-CalcLayout();
+}
+
+}
+
void SAL_CALL SwXDocumentIndex::update() throw (uno::RuntimeException)
{
vos::OGuard aGuard(Application::GetSolarMutex());
@@ -595,6 +611,10 @@ void SAL_CALL SwXDocumentIndex::update()
throw uno::RuntimeException();
}
pTOXBase-Update();
+
+// the insertion of TOC will affect the document layout
+lcl_CalcLayout(m_pImpl-m_pDoc);
+
// page numbers
pTOXBase-UpdatePageNum();
}
svn commit: r1554147 - in /openoffice/trunk/main/oox: inc/oox/xls/worksheethelper.hxx source/xls/worksheetfragment.cxx source/xls/worksheethelper.cxx
Author: steve_y
Date: Mon Dec 30 05:52:36 2013
New Revision: 1554147
URL: http://svn.apache.org/r1554147
Log:
Bug 123910 - The reference in validation condition change to #REF! in exported
xls file
Build break fix
Modified:
openoffice/trunk/main/oox/inc/oox/xls/worksheethelper.hxx
openoffice/trunk/main/oox/source/xls/worksheetfragment.cxx
openoffice/trunk/main/oox/source/xls/worksheethelper.cxx
Modified: openoffice/trunk/main/oox/inc/oox/xls/worksheethelper.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/inc/oox/xls/worksheethelper.hxx?rev=1554147r1=1554146r2=1554147view=diff
==
--- openoffice/trunk/main/oox/inc/oox/xls/worksheethelper.hxx (original)
+++ openoffice/trunk/main/oox/inc/oox/xls/worksheethelper.hxx Mon Dec 30
05:52:36 2013
@@ -154,6 +154,7 @@ struct ValidationModel
ApiCellRangeListmaRanges;
ApiTokenSequencemaTokens1;
ApiTokenSequencemaTokens2;
+::rtl::OUString msRef;
::rtl::OUString maInputTitle;
::rtl::OUString maInputMessage;
::rtl::OUString maErrorTitle;
Modified: openoffice/trunk/main/oox/source/xls/worksheetfragment.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/xls/worksheetfragment.cxx?rev=1554147r1=1554146r2=1554147view=diff
==
--- openoffice/trunk/main/oox/source/xls/worksheetfragment.cxx (original)
+++ openoffice/trunk/main/oox/source/xls/worksheetfragment.cxx Mon Dec 30
05:52:36 2013
@@ -158,6 +158,7 @@ void DataValidationsContext::importDataV
{
mxValModel.reset( new ValidationModel );
getAddressConverter().convertToCellRangeList( mxValModel-maRanges,
rAttribs.getString( XML_sqref, OUString() ), getSheetIndex(), true );
+mxValModel-msRef = rAttribs.getString( XML_sqref, OUString() );
mxValModel-maInputTitle = rAttribs.getXString( XML_promptTitle,
OUString() );
mxValModel-maInputMessage = rAttribs.getXString( XML_prompt, OUString() );
mxValModel-maErrorTitle = rAttribs.getXString( XML_errorTitle,
OUString() );
Modified: openoffice/trunk/main/oox/source/xls/worksheethelper.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/xls/worksheethelper.cxx?rev=1554147r1=1554146r2=1554147view=diff
==
--- openoffice/trunk/main/oox/source/xls/worksheethelper.cxx (original)
+++ openoffice/trunk/main/oox/source/xls/worksheethelper.cxx Mon Dec 30
05:52:36 2013
@@ -1093,6 +1093,26 @@ void WorksheetGlobals::finalizeValidatio
{
}
+try
+{
+sal_Int32 nIndex = 0;
+OUString aToken = aIt-msRef.getToken( 0, ' ', nIndex );
+
+ReferenceXSpreadsheet xSheet = getSheetFromDoc(
getCurrentSheetIndex() );
+ReferenceXCellRange xDBCellRange;
+ReferenceXCell xCell;
+xDBCellRange = xSheet-getCellRangeByName( aToken );
+
+xCell = xDBCellRange-getCellByPosition( 0, 0 );
+ReferenceXCellAddressable xCellAddressable( xCell,
UNO_QUERY_THROW );
+CellAddress aFirstCell = xCellAddressable-getCellAddress();
+ReferenceXSheetCondition xCondition( xValidation,
UNO_QUERY_THROW );
+xCondition-setSourcePosition( aFirstCell );
+}
+catch( Exception )
+{
+}
+
// convert validation type to API enum
ValidationType eType = ValidationType_ANY;
switch( aIt-mnType )
svn commit: r1550645 - in /openoffice/trunk/main/svx/source: accessibility/AccessibleShape.cxx table/accessibletableshape.cxx
Author: steve_y
Date: Fri Dec 13 05:20:32 2013
New Revision: 1550645
URL: http://svn.apache.org/r1550645
Log:
fixes for issues checked out by coverity
Modified:
openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx
openoffice/trunk/main/svx/source/table/accessibletableshape.cxx
Modified: openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx?rev=1550645r1=1550644r2=1550645view=diff
==
--- openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx
(original)
+++ openoffice/trunk/main/svx/source/accessibility/AccessibleShape.cxx Fri Dec
13 05:20:32 2013
@@ -435,19 +435,18 @@ uno::ReferenceXAccessibleRelationSet S
throw (::com::sun::star::uno::RuntimeException)
{
::osl::MutexGuard aGuard (maMutex);
-::utl::AccessibleRelationSetHelper* pRelationSet = new
utl::AccessibleRelationSetHelper;
-uno::Sequence uno::Reference uno::XInterface aSequence(1);
-aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
+::utl::AccessibleRelationSetHelper* pRelationSet = new
utl::AccessibleRelationSetHelper;
//this mxshape is the captioned shape, only for sw
-if(aSequence[0].get())
-{
-pRelationSet-AddRelation(
-AccessibleRelation( AccessibleRelationType::DESCRIBED_BY,
aSequence ) );
-}
-
if (pRelationSet != NULL)
{
+ uno::Sequence uno::Reference uno::XInterface aSequence(1);
+ aSequence[0] = mpParent-GetAccessibleCaption(mxShape);
+ if(aSequence[0].get())
+ {
+ pRelationSet-AddRelation(
+ AccessibleRelation(
AccessibleRelationType::DESCRIBED_BY, aSequence ) );
+ }
return uno::ReferenceXAccessibleRelationSet (
new ::utl::AccessibleRelationSetHelper (*pRelationSet));
}
@@ -455,8 +454,6 @@ uno::ReferenceXAccessibleRelationSet S
{
return uno::ReferenceXAccessibleRelationSet(NULL);
}
-
-return uno::ReferenceXAccessibleRelationSet();
}
/**Return a copy of the state set.
Modified: openoffice/trunk/main/svx/source/table/accessibletableshape.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/table/accessibletableshape.cxx?rev=1550645r1=1550644r2=1550645view=diff
==
--- openoffice/trunk/main/svx/source/table/accessibletableshape.cxx (original)
+++ openoffice/trunk/main/svx/source/table/accessibletableshape.cxx Fri Dec 13
05:20:32 2013
@@ -328,6 +328,7 @@ void SAL_CALL AccessibleTableShapeImpl::
AccessibleTableShape::AccessibleTableShape( const AccessibleShapeInfo
rShapeInfo, const AccessibleShapeTreeInfo rShapeTreeInfo)
: AccessibleTableShape_Base(rShapeInfo, rShapeTreeInfo)
, mxImpl( new AccessibleTableShapeImpl( maShapeTreeInfo ) )
+, mnPreviousSelectionCount(0)
{
}
@@ -342,8 +343,7 @@ AccessibleTableShape::~AccessibleTableSh
void AccessibleTableShape::Init()
{
try
- {
- mnPreviousSelectionCount = 0;
+ {
Reference XPropertySet xSet( mxShape, UNO_QUERY_THROW );
Reference XTable xTable(
xSet-getPropertyValue(C2U(Model)), UNO_QUERY_THROW );
svn commit: r1549778 - /openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx
Author: steve_y Date: Tue Dec 10 07:58:01 2013 New Revision: 1549778 URL: http://svn.apache.org/r1549778 Log: Bug 123620 - [ia2] IAccessibleHypertext::hyperlinkIndex returns 0 when editing a cell/object where there is no link Modified: openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx Modified: openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx?rev=1549778r1=1549777r2=1549778view=diff == --- openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx (original) +++ openoffice/trunk/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx Tue Dec 10 07:58:01 2013 @@ -3005,7 +3005,7 @@ namespace accessibility //const sal_uInt16 nEEIndex = aIndex.GetEEIndex(); const sal_uInt16 nEEIndex = rT.CalcEditEngineIndex( nPara, nCharIndex ); -sal_Int32 nHLIndex = 0; +sal_Int32 nHLIndex = -1; //i123620 sal_uInt16 nHyperLink = 0; sal_uInt16 nFields = rT.GetFieldCount( nPara ); for ( sal_uInt16 n = 0; n nFields; n++ )
svn commit: r1549481 - /openoffice/trunk/main/extensions/source/ole/oleobjw.cxx
Author: steve_y
Date: Mon Dec 9 06:15:26 2013
New Revision: 1549481
URL: http://svn.apache.org/r1549481
Log:
Bug 123816 - Cannot send email with attachment via VBA code taking Notes as
mail application
Modified:
openoffice/trunk/main/extensions/source/ole/oleobjw.cxx
Modified: openoffice/trunk/main/extensions/source/ole/oleobjw.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/extensions/source/ole/oleobjw.cxx?rev=1549481r1=1549480r2=1549481view=diff
==
--- openoffice/trunk/main/extensions/source/ole/oleobjw.cxx (original)
+++ openoffice/trunk/main/extensions/source/ole/oleobjw.cxx Mon Dec 9 06:15:26
2013
@@ -2333,6 +2333,50 @@ void IUnknownWrapper_Impl::getPropDesc(c
//else no entry for sFuncName, pFuncDesc will not be filled in
}
+VARTYPE lcl_getUserDefinedElementType( ITypeInfo* pTypeInfo, const DWORD
nHrefType )
+{
+VARTYPE _type( VT_NULL );
+if ( pTypeInfo )
+{
+CComPtrITypeInfo spRefInfo;
+pTypeInfo-GetRefTypeInfo( nHrefType, spRefInfo.p );
+if ( spRefInfo )
+{
+TypeAttr attr( spRefInfo );
+spRefInfo-GetTypeAttr( attr );
+if ( attr-typekind == TKIND_ENUM )
+{
+// We use the type of the first enum value.
+if ( attr-cVars == 0 )
+{
+throw BridgeRuntimeError(OUSTR([automation bridge] Could
not obtain type description));
+}
+VarDesc var( spRefInfo );
+spRefInfo-GetVarDesc( 0, var );
+_type = var-lpvarValue-vt;
+}
+else if ( attr-typekind == TKIND_INTERFACE )
+{
+_type = VT_UNKNOWN;
+}
+else if ( attr-typekind == TKIND_DISPATCH )
+{
+_type = VT_DISPATCH;
+}
+else if ( attr-typekind == TKIND_ALIAS )
+{
+// TKIND_ALIAS is a type that is an alias for another type. So
get that alias type.
+_type = lcl_getUserDefinedElementType( pTypeInfo,
attr-tdescAlias.hreftype );
+}
+else
+{
+throw BridgeRuntimeError( OUSTR([automation bridge] Unhandled
user defined type.) );
+}
+}
+}
+return _type;
+}
+
VARTYPE IUnknownWrapper_Impl::getElementTypeDesc(const TYPEDESC *desc)
{
VARTYPE _type( VT_NULL );
@@ -2350,38 +2394,7 @@ VARTYPE IUnknownWrapper_Impl::getElement
else if (desc-vt == VT_USERDEFINED)
{
ITypeInfo* thisInfo = getTypeInfo(); //kept by this instance
- CComPtrITypeInfo spRefInfo;
- thisInfo-GetRefTypeInfo(desc-hreftype, spRefInfo.p);
- if (spRefInfo)
- {
- TypeAttr attr(spRefInfo);
- spRefInfo-GetTypeAttr( attr);
- if (attr-typekind == TKIND_ENUM)
- {
- //We use the type of the first enum value.
- if (attr-cVars == 0)
- {
- throw
BridgeRuntimeError(OUSTR([automation bridge] Could
- not obtain type description));
- }
- VarDesc var(spRefInfo);
- spRefInfo-GetVarDesc(0, var);
- _type = var-lpvarValue-vt;
- }
- else if (attr-typekind == TKIND_INTERFACE)
- {
- _type = VT_UNKNOWN;
- }
- else if (attr-typekind == TKIND_DISPATCH)
- {
- _type = VT_DISPATCH;
- }
- else
- {
- throw BridgeRuntimeError(OUSTR([automation
bridge]
- Unhandled user defined type.));
- }
- }
+ _type = lcl_getUserDefinedElementType( thisInfo, desc-hreftype
);
}
else
{
svn commit: r1547747 - in /openoffice/trunk/main/sw/source/core/access: acccontext.cxx accpara.cxx
Author: steve_y
Date: Wed Dec 4 10:09:58 2013
New Revision: 1547747
URL: http://svn.apache.org/r1547747
Log:
i121761 - [ia2] Writer crashes on exit with an msvcrt runtime error
Modified:
openoffice/trunk/main/sw/source/core/access/acccontext.cxx
openoffice/trunk/main/sw/source/core/access/accpara.cxx
Modified: openoffice/trunk/main/sw/source/core/access/acccontext.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/acccontext.cxx?rev=1547747r1=1547746r2=1547747view=diff
==
--- openoffice/trunk/main/sw/source/core/access/acccontext.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/acccontext.cxx Wed Dec 4
10:09:58 2013
@@ -588,7 +588,8 @@ SwAccessibleContext::SwAccessibleContext
SwAccessibleContext::~SwAccessibleContext()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ if(Application::GetUnoWrapper())
+ vos::OGuard aGuard(Application::GetSolarMutex());
DBG_MSG_CD( destructed )
RemoveFrmFromAccessibleMap();
Modified: openoffice/trunk/main/sw/source/core/access/accpara.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/core/access/accpara.cxx?rev=1547747r1=1547746r2=1547747view=diff
==
--- openoffice/trunk/main/sw/source/core/access/accpara.cxx (original)
+++ openoffice/trunk/main/sw/source/core/access/accpara.cxx Wed Dec 4 10:09:58
2013
@@ -594,7 +594,8 @@ SwAccessibleParagraph::SwAccessibleParag
SwAccessibleParagraph::~SwAccessibleParagraph()
{
- vos::OGuard aGuard(Application::GetSolarMutex());
+ if(Application::GetUnoWrapper())
+ vos::OGuard aGuard(Application::GetSolarMutex());
delete pPortionData;
delete pHyperTextData;
svn commit: r1541847 [3/18] - in /openoffice/trunk: ./ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/helper/ main/accessibility/inc/accessibility/standard/ main/a
Modified:
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx?rev=1541847r1=1541846r2=1541847view=diff
==
---
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx
(original)
+++
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolbox.cxx
Thu Nov 14 08:18:05 2013
@@ -208,7 +208,7 @@ VCLXAccessibleToolBoxItem* VCLXAccessibl
{
ToolBoxItemsMap::iterator aIter = m_aAccessibleChildren.find(
_nPos );
// returns only toolbox buttons, not windows
- if ( aIter != m_aAccessibleChildren.end()
!aIter-second.is())
+ if ( aIter != m_aAccessibleChildren.end()
aIter-second.is())
pItem = static_cast VCLXAccessibleToolBoxItem* (
aIter-second.get() );
}
@@ -284,11 +284,14 @@ void VCLXAccessibleToolBox::ReleaseFocus
}
}
//
-
-void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 )
+void VCLXAccessibleToolBox::UpdateChecked_Impl( sal_Int32 _nPos )
{
ToolBox* pToolBox = static_cast ToolBox* ( GetWindow() );
if ( pToolBox )
{
+ sal_uInt16 nFocusId = pToolBox-GetItemId( (sal_uInt16)_nPos );
+ VCLXAccessibleToolBoxItem* pFocusItem = NULL;
+
for ( ToolBoxItemsMap::iterator aIter =
m_aAccessibleChildren.begin();
aIter != m_aAccessibleChildren.end(); ++aIter )
{
@@ -297,7 +300,12 @@ void VCLXAccessibleToolBox::UpdateChecke
VCLXAccessibleToolBoxItem* pItem =
static_cast VCLXAccessibleToolBoxItem* (
aIter-second.get() );
pItem-SetChecked( pToolBox-IsItemChecked( nItemId ) );
+if ( nItemId == nFocusId )
+pFocusItem = pItem;
}
+ //Solution:If the position is not a child item,the focus should
not be called
+ if ( pFocusItem (sal_uInt16)_nPos != TOOLBOX_ITEM_NOTFOUND )
+ pFocusItem-SetFocus( sal_True );
}
}
//
-
@@ -535,23 +543,41 @@ void VCLXAccessibleToolBox::ProcessWindo
// to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING)
Reference XAccessibleContext xTemp = this;
+ ToolBox* pToolBox = static_cast ToolBox* ( GetWindow() );
switch ( rVclWindowEvent.GetId() )
{
case VCLEVENT_TOOLBOX_CLICK:
+ case VCLEVENT_TOOLBOX_SELECT:
{
if ( rVclWindowEvent.GetData() )
{
UpdateChecked_Impl(
(sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
UpdateIndeterminate_Impl(
(sal_Int32)(sal_IntPtr)rVclWindowEvent.GetData() );
}
+ else if( pToolBox-GetItemPos(pToolBox-GetCurItemId())
!= TOOLBOX_ITEM_NOTFOUND )
+ {
+ UpdateChecked_Impl(
pToolBox-GetItemPos(pToolBox-GetCurItemId()) );
+ UpdateIndeterminate_Impl(
pToolBox-GetItemPos(pToolBox-GetCurItemId()) );
+ }
break;
}
case VCLEVENT_TOOLBOX_DOUBLECLICK:
case VCLEVENT_TOOLBOX_ACTIVATE:
case VCLEVENT_TOOLBOX_DEACTIVATE:
- case VCLEVENT_TOOLBOX_SELECT:
+ //case VCLEVENT_TOOLBOX_SELECT:
break;
-
+ // IA2 CWS. MT: Still using VCLEVENT_TOOLBOX_CLICK, see comment
in vcl/source/window/toolbox2.cxx
+ /*
+ case VCLEVENT_TOOLBOX_ITEMUPDATED:
+ {
+ if ( rVclWindowEvent.GetData() )
+ {
+ UpdateChecked_Impl( TOOLBOX_ITEM_NOTFOUND );
+ UpdateIndeterminate_Impl(
(sal_Int32)rVclWindowEvent.GetData() );
+ }
+ break;
+ }
+ */
case VCLEVENT_TOOLBOX_HIGHLIGHT:
UpdateFocus_Impl();
break;
Modified:
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx?rev=1541847r1=1541846r2=1541847view=diff
==
---
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
(original)
+++
openoffice/trunk/main/accessibility/source/standard/vclxaccessibletoolboxitem.cxx
Thu Nov 14 08:18:05 2013
@@ -97,6 +97,10 @@
svn commit: r1541847 [18/18] - in /openoffice/trunk: ./ main/accessibility/inc/accessibility/extended/ main/accessibility/inc/accessibility/helper/ main/accessibility/inc/accessibility/standard/ main/
Modified: openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx?rev=1541847r1=1541846r2=1541847view=diff
==
--- openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/vclevent.hxx Thu Nov 14 08:18:05 2013
@@ -154,6 +154,10 @@ namespace com { namespace sun { namespac
#define VCLEVENT_ITEM_COLLAPSED 1175
// --
#define VCLEVENT_DROPDOWN_PRE_OPEN 1176
+//IAccessibility2 Implementation 2009-
+#define VCLEVENT_LISTBOX_FOCUSITEMCHANGED 1180
+// #define VCLEVENT_EDIT_CARETCHANGED // IA2 CWS. MT:
VCL only has selection API - difference for selection_changed vs. caret_changed
is handled in accessibility wrapper since OOo 3.2
+//-IAccessibility2 Implementation 2009
// VclMenuEvent
#define VCLEVENT_MENU_ACTIVATE 1200
@@ -172,24 +176,39 @@ namespace com { namespace sun { namespac
#define VCLEVENT_MENU_ITEMCHECKED 1213
#define VCLEVENT_MENU_ITEMUNCHECKED1214
#define VCLEVENT_MENU_ACCESSIBLENAMECHANGED1215
+//IAccessibility2 Implementation 2009-
+#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED 1216
+#define VCLEVENT_TOOLBOX_ITEMUPDATED 1217
+//-IAccessibility2 Implementation 2009
#define VCLEVENT_MENU_SHOW 1250
#define VCLEVENT_MENU_HIDE 1251
#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED 1216
-
+//IAccessibility2 Implementation 2009-
+#define VCLEVENT_LISTBOX_TREEEXPAND 1218
+#define VCLEVENT_LISTBOX_TREECOLLAPSE 1219
+#define VCLEVENT_LISTBOX_TREEFOCUS 1220
+#define VCLEVENT_LISTBOX_TREESELECT1221
+#define VCLEVENT_EDIT_CARETCHANGED 1222
+#define VCLEVENT_COMBOBOX_UPDATEVALUE 1223
+
+#define VCLEVENT_LISTBOX_FOCUS 1224
+#define VCLEVENT_LISTBOX_CLEAR 1225
+//-IAccessibility2 Implementation 2009
// DockingWindow
-#define VCLEVENT_WINDOW_STARTDOCKING1217// pData = DockingData
-#define VCLEVENT_WINDOW_DOCKING 1218
-#define VCLEVENT_WINDOW_ENDDOCKING 1219// pData =
EndDockingData
-#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING 1220// pData = sal_Bool
-#define VCLEVENT_WINDOW_TOGGLEFLOATING 1221
-#define VCLEVENT_WINDOW_ENDPOPUPMODE1222// pData =
EndPopupModeData
-
-#define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1223// pData = itempos
-#define VCLEVENT_TABLECELL_NAMECHANGED 1224// pData =
struct(Entry, Column, oldText)
-#define VCLEVENT_TABLEROW_SELECT 1225
-
+#define VCLEVENT_WINDOW_STARTDOCKING1227// pData = DockingData
+#define VCLEVENT_WINDOW_DOCKING 1228
+#define VCLEVENT_WINDOW_ENDDOCKING 1229// pData =
EndDockingData
+#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING 1230// pData = sal_Bool
+#define VCLEVENT_WINDOW_TOGGLEFLOATING 1231
+#define VCLEVENT_WINDOW_ENDPOPUPMODE1232// pData =
EndPopupModeData
+
+#define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1233// pData = itempos
+#define VCLEVENT_TABLECELL_NAMECHANGED 1234// pData =
struct(Entry, Column, oldText)
+#define VCLEVENT_TABLEROW_SELECT 1235
+// IAccessible2 implementation 2009
+#define VCLEVENT_LISTBOX_STATEUPDATE 1236
class VCL_DLLPUBLIC VclSimpleEvent
{
private:
Modified: openoffice/trunk/main/vcl/inc/vcl/window.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/inc/vcl/window.hxx?rev=1541847r1=1541846r2=1541847view=diff
==
--- openoffice/trunk/main/vcl/inc/vcl/window.hxx (original)
+++ openoffice/trunk/main/vcl/inc/vcl/window.hxx Thu Nov 14 08:18:05 2013
@@ -629,6 +629,11 @@ public:
virtual voidDataChanged( const DataChangedEvent rDCEvt );
virtual longPreNotify( NotifyEvent rNEvt );
virtual longNotify( NotifyEvent rNEvt );
+//IAccessibility2 Implementation 2009-
+virtual voidNotifyVCLEvent( sal_uLong nEvent ,void* pData = NULL);
+virtual ::com::sun::star::uno::Sequence ::com::sun::star::uno::Reference
::com::sun::star::uno::XInterface GetAccFlowToSequence();
+ virtual void SwitchView() {}
+//-IAccessibility2 Implementation 2009
virtual Window* GetPreferredKeyInputWindow();
/*virtual*/ voidAddEventListener( const Link rEventListener );
Modified: openoffice/trunk/main/vcl/source/app/svapp.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/source/app/svapp.cxx?rev=1541847r1=1541846r2=1541847view=diff
==
--- openoffice/trunk/main/vcl/source/app/svapp.cxx (original)
+++
svn commit: r1541823 - /openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx
Author: steve_y
Date: Thu Nov 14 05:15:44 2013
New Revision: 1541823
URL: http://svn.apache.org/r1541823
Log:
Fix for i123643 - [ia2] IAccessible2 is not enabled automatically even with an
AT running
Modified:
openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx
Modified: openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx?rev=1541823r1=1541822r2=1541823view=diff
==
--- openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx (original)
+++ openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx Thu Nov 14
05:15:44 2013
@@ -6204,6 +6204,13 @@ LRESULT CALLBACK SalFrameWndProc( HWND h
}
else
{
+ // IA2 should be enabled automatically
+ AllSettings aSettings =
Application::GetSettings();
+ MiscSettings aMisc =
aSettings.GetMiscSettings();
+ aMisc.SetEnableATToolSupport( sal_True
);
+ aSettings.SetMiscSettings( aMisc );
+ Application::SetSettings( aSettings );
+
if
(Application::GetSettings().GetMiscSettings().GetEnableATToolSupport())
{
// Make sure to launch
Accessibiliity only the following criterias are satisfied to avoid RFT
interrupts regular acc processing
svn commit: r1540658 [3/3] - in /openoffice/branches/ia2: ./ main/ main/automation/source/mozillaserver/ main/basegfx/inc/basegfx/color/ main/basegfx/source/color/ main/connectivity/ main/connectivity
Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/control.pm
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/control.pm?rev=1540658r1=1540657r2=1540658view=diff
==
--- openoffice/branches/ia2/main/solenv/bin/modules/installer/control.pm
(original)
+++ openoffice/branches/ia2/main/solenv/bin/modules/installer/control.pm Mon
Nov 11 10:36:02 2013
@@ -76,7 +76,6 @@ sub check_system_path
{
# The following files have to be found in the environment variable PATH
# All platforms: zip
- # Windows only: msvcp70.dll, msvcr70.dll for regcomp.exe
# Windows only: msiinfo.exe, msidb.exe, uuidgen.exe,
makecab.exe, msitran.exe, expand.exe for msi database and packaging
my $onefile;
@@ -104,19 +103,6 @@ sub check_system_path
if (($installer::globals::iswin)
($installer::globals::iswindowsbuild))
{
@needed_files_in_path = (zip.exe, msiinfo.exe, msidb.exe,
uuidgen.exe, makecab.exe, msitran.exe, expand.exe);
-
- if ( $installer::globals::compiler eq wntmsci8 )
- {
- push(@needed_files_in_path, msvcp70.dll);
- push(@needed_files_in_path, msvcr70.dll);
- }
-
- if ( $installer::globals::compiler eq wntmsci10 )
- {
- push(@needed_files_in_path, msvcp71.dll);
- push(@needed_files_in_path, msvcr71.dll);
- }
-
}
elsif ($installer::globals::iswin || $installer::globals::isos2)
{
@@ -335,7 +321,7 @@ sub filter_log_error ()
# Remove all filenames that contain the word Error.
my $work_string = $message;
- $work_string =~ s/Error\.(idt|mlf|ulf|html|hpp|ipp)//g;
+ $work_string =~ s/Error\.(idt|mlf|ulf|idl|html|hpp|ipp)//g;
if ($work_string =~ /\bError\b/i)
{
Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm?rev=1540658r1=1540657r2=1540658view=diff
==
--- openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm
(original)
+++ openoffice/branches/ia2/main/solenv/bin/modules/installer/epmfile.pm Mon
Nov 11 10:36:02 2013
@@ -2312,7 +2312,7 @@ sub log_rpm_info
$infoline = $rpmout\n;
$infoline =~ s/error/e_r_r_o_r/gi; # avoiding log
problems
-$installer::logger::Lang-printf($infoline);
+$installer::logger::Lang-print($infoline);
}
}
else
Modified: openoffice/branches/ia2/main/solenv/bin/modules/installer/logger.pm
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/bin/modules/installer/logger.pm?rev=1540658r1=1540657r2=1540658view=diff
==
--- openoffice/branches/ia2/main/solenv/bin/modules/installer/logger.pm
(original)
+++ openoffice/branches/ia2/main/solenv/bin/modules/installer/logger.pm Mon Nov
11 10:36:02 2013
@@ -144,11 +144,12 @@ sub printf ($$@)
{
my ($self, $format, @arguments) = @_;
-my $message = sprintf($format, @arguments);
-if ($message =~ /\%/)
+if ($format =~ /\%\{/)
{
+printf(%s\n, $format);
PrintStackTrace();
}
+my $message = sprintf($format, @arguments);
$self-print($message, 0);
}
@@ -659,6 +660,7 @@ sub PrintStackTrace ()
}
}
+
sub Die ($)
{
my ($message) = @_;
Modified: openoffice/branches/ia2/main/solenv/inc/extension_post.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/solenv/inc/extension_post.mk?rev=1540658r1=1540657r2=1540658view=diff
==
--- openoffice/branches/ia2/main/solenv/inc/extension_post.mk (original)
+++ openoffice/branches/ia2/main/solenv/inc/extension_post.mk Mon Nov 11
10:36:02 2013
@@ -92,39 +92,19 @@ $(PACK_RUNTIME_FLAG) : $(EXTENSIONDIR)
.ENDIF
.ELSE
.IF $(PACKMS)!=
-.IF $(CCNUMVER) = 0013
- $(GNUCOPY) $(PACKMS)/msvcr71.dll $(EXTENSIONDIR)
-$(GNUCOPY) $(PACKMS)/msvcp71.dll $(EXTENSIONDIR)
-.ELSE # $(CCNUMVER) = 0013
-.IF $(CCNUMVER) = 0014
- $(GNUCOPY) $(PACKMS)/msvcr80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcp80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/msvcm80.dll $(EXTENSIONDIR)
- $(GNUCOPY) $(PACKMS)/Microsoft.VC80.CRT.manifest $(EXTENSIONDIR)
-.ELSE # $(CCNUMVER) = 0014
+.IF $(CCNUMVER) 0014
$(GNUCOPY) $(PACKMS)/msvcr90.dll
svn commit: r1539225 - /openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl
Author: steve_y
Date: Wed Nov 6 03:19:12 2013
New Revision: 1539225
URL: http://svn.apache.org/r1539225
Log:
Added importlib oleacc.dll from Jamie's suggestion.
Modified:
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl
Modified:
openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl?rev=1539225r1=1539224r2=1539225view=diff
==
--- openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl
(original)
+++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl
Wed Nov 6 03:19:12 2013
@@ -90,6 +90,7 @@ library UACCCOMLib
{
importlib(stdole32.tlb);
importlib(stdole2.tlb);
+ importlib(oleacc.dll);
[
uuid(CF8DF8BA-44FE-4B10-BD2E-8C8CB322485F),
svn commit: r1538382 [1/3] - in /openoffice/branches/ia2/main: scp2/source/ooo/ vcl/inc/ vcl/inc/vcl/ vcl/source/app/ vcl/win/source/window/ winaccessibility/inc/ winaccessibility/source/UAccCOM/ wina
Author: steve_y Date: Sun Nov 3 15:42:11 2013 New Revision: 1538382 URL: http://svn.apache.org/r1538382 Log: 1. Updated ia2 api idl with version 1.3 2. Changed UAccCOM.dll to a isolated COM dll Added: openoffice/branches/ia2/main/winaccessibility/inc/act.hxx Removed: openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccComMarshal.def openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/Accessible2.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleAction.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleApplication.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleComponent.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleEditableText.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleEventId.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleHyperlink.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleHypertext.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleImage.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleRelation.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleRole.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleStates.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleTable.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleText.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/AccessibleValue.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/IA2CommonTypes.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/IA2TypeLibrary.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/dlldata.c Modified: openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp openoffice/branches/ia2/main/vcl/inc/svdata.hxx openoffice/branches/ia2/main/vcl/inc/vcl/svapp.hxx openoffice/branches/ia2/main/vcl/source/app/svapp.cxx openoffice/branches/ia2/main/vcl/win/source/window/salframe.cxx openoffice/branches/ia2/main/winaccessibility/inc/AccObjectWinManager.hxx openoffice/branches/ia2/main/winaccessibility/inc/accHelper.hxx openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccComponent.h openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccHypertext.cpp openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/AccTable.cpp openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/EnumVariant.cpp openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.cpp openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.h openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.cpp openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/makefile.mk openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/makefile.mk openoffice/branches/ia2/main/winaccessibility/source/service/AccObject.cxx openoffice/branches/ia2/main/winaccessibility/source/service/AccObjectWinManager.cxx openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.cxx openoffice/branches/ia2/main/winaccessibility/source/service/checkmt.hxx openoffice/branches/ia2/main/winaccessibility/source/service/makefile.mk Modified: openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp?rev=1538382r1=1538381r2=1538382view=diff == --- openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp (original) +++ openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp Sun Nov 3 15:42:11 2013 @@ -32,7 +32,7 @@ File gid_File_Lib_Winaccessibility End File gid_File_Lib_UAccCOM BIN_FILE_BODY; - Styles = (PACKED, SELFREG); + Styles = (PACKED); Dir = SCP2_OOO_BIN_DIR; Name= UAccCOM.dll; End Modified: openoffice/branches/ia2/main/vcl/inc/svdata.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/svdata.hxx?rev=1538382r1=1538381r2=1538382view=diff == --- openoffice/branches/ia2/main/vcl/inc/svdata.hxx (original) +++ openoffice/branches/ia2/main/vcl/inc/svdata.hxx Sun Nov 3 15:42:11 2013 @@ -184,7 +184,6 @@ struct ImplSVAppData //IAccessibility2 Implementation 2009- long m_bEnableAccessInterface; - long m_mbIsBridgeRegistered; //-IAccessibility2 Implementation 2009
svn commit: r1538382 [3/3] - in /openoffice/branches/ia2/main: scp2/source/ooo/ vcl/inc/ vcl/inc/vcl/ vcl/source/app/ vcl/win/source/window/ winaccessibility/inc/ winaccessibility/source/UAccCOM/ wina
Modified: openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.h URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.h?rev=1538382r1=1538381r2=1538382view=diff == --- openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.h (original) +++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/MAccessible.h Sun Nov 3 15:42:11 2013 @@ -34,9 +34,6 @@ #ifndef __ACCCOMMON_H_ #include acccommon.h #endif -#ifndef __AccessibleApplication_h__ -#include AccessibleApplication.h -#endif #ifndef _RTL_USTRING_HXX_ #include rtl/ustring.hxx #endif Modified: openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.cpp URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.cpp?rev=1538382r1=1538381r2=1538382view=diff == --- openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.cpp (original) +++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/UAccCOM.cpp Sun Nov 3 15:42:11 2013 @@ -25,17 +25,7 @@ #include UAccCOM2.h #include UAccCOM_i.c -#include Accessible2_i.c -#include AccessibleComponent_i.c -#include AccessibleText_i.c -#include AccessibleEditableText_i.c -#include AccessibleImage_i.c -#include AccessibleTable_i.c -#include AccessibleAction_i.c -#include AccessibleValue_i.c -#include AccessibleHyperText_i.c -#include AccessibleRelation_i.c -#include AccessibleHyperLink_i.c +#include ia2_api_all_i.c #include MAccessible.h #include EnumVariant.h Modified: openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/makefile.mk?rev=1538382r1=1538381r2=1538382view=diff == --- openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/makefile.mk (original) +++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOM/makefile.mk Sun Nov 3 15:42:11 2013 @@ -97,24 +97,20 @@ EXCEPTIONSFILES= \ SHL1TARGET=$(TARGET) SHL1STDLIBS=\ -oleacc.lib\ -icuuc.lib\ -icuin.lib\ +$(ICUUCLIB)\ +$(ICUINLIB)\ $(CPPULIB)\ $(VCLLIB) \ $(SALLIB)\ - kernel32.lib \ - user32.lib \ - advapi32.lib \ - ole32.lib \ - oleaut32.lib \ - delayimp.lib \ - shlwapi.lib \ - uuid.lib + $(KERNEL32LIB) \ + $(USER32LIB) \ + $(ADVAPI32LIB) \ + $(OLE32LIB) \ + $(OLEAUT32LIB) \ + $(SHLWAPILIB) \ + $(UUIDLIB) \ + oleacc.lib -LINKFLAGS += /delayload:sal3.dll \ - /delayload:cppu3.dll - .IF $(COM)!=GCC .IF $(CCNUMVER) 0013 .IF $(USE_STLP_DEBUG) != @@ -136,3 +132,11 @@ DEF1NAME= $(TARGET) # --- Targets -- .INCLUDE : target.mk + +ALLTAR : \ +$(MISC)/$(TARGET).manifest \ + +$(MISC)/$(TARGET).manifest: $(BIN)$/$(TARGET)$(DLLPOST) + cat *.rgs $(MISC)$/$(TARGET).rgs + mt.exe -rgs:$(MISC)$/$(TARGET).rgs -tlb:$(MISC)$/$(TARGET).tlb -dll:$(TARGET).dll -out:$(MISC)$/$(TARGET).manifest + mt.exe -manifest $(MISC)$/$(TARGET).manifest -outputresource:$(BIN)$/$(TARGET)$(DLLPOST)\;\#97 \ No newline at end of file Modified: openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl?rev=1538382r1=1538381r2=1538382view=diff == --- openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl (original) +++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/UAccCOM.idl Sun Nov 3 15:42:11 2013 @@ -21,19 +21,9 @@ import oaidl.idl; import ocidl.idl; -import Accessible2.idl; + +import ia2_api_all.idl; import defines.idl; -import AccessibleComponent.idl; -import AccessibleAction.idl; -import AccessibleRelation.idl; -import AccessibleTable.idl; -import AccessibleText.idl; -import AccessibleHyperlink.idl; -import AccessibleEditableText.idl; -import AccessibleValue.idl; -import AccessibleImage.idl; -import AccessibleValue.idl; -import AccessibleHypertext.idl; [ object, Modified: openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/makefile.mk URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/makefile.mk?rev=1538382r1=1538381r2=1538382view=diff == --- openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/makefile.mk (original) +++ openoffice/branches/ia2/main/winaccessibility/source/UAccCOMIDL/makefile.mk Sun
svn commit: r1537831 - in /openoffice/trunk/main/oox/source: core/xmlfilterbase.cxx token/namespaces.txt token/tokens.txt
Author: steve_y Date: Fri Nov 1 05:51:39 2013 New Revision: 1537831 URL: http://svn.apache.org/r1537831 Log: i123528: Only placeholder shown for cropped picture in particular .pptx Modified: openoffice/trunk/main/oox/source/core/xmlfilterbase.cxx openoffice/trunk/main/oox/source/token/namespaces.txt openoffice/trunk/main/oox/source/token/tokens.txt Modified: openoffice/trunk/main/oox/source/core/xmlfilterbase.cxx URL: http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/core/xmlfilterbase.cxx?rev=1537831r1=1537830r2=1537831view=diff == --- openoffice/trunk/main/oox/source/core/xmlfilterbase.cxx (original) +++ openoffice/trunk/main/oox/source/core/xmlfilterbase.cxx Fri Nov 1 05:51:39 2013 @@ -19,8 +19,6 @@ * */ - - #include oox/core/xmlfilterbase.hxx #include cstdio @@ -120,6 +118,7 @@ XmlFilterBaseImpl::XmlFilterBaseImpl( co maFastParser.registerNamespace( NMSP_ax ); maFastParser.registerNamespace( NMSP_xm ); +maFastParser.registerNamespace( NMSP_markupCompat );// i123528 } // Modified: openoffice/trunk/main/oox/source/token/namespaces.txt URL: http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/token/namespaces.txt?rev=1537831r1=1537830r2=1537831view=diff == --- openoffice/trunk/main/oox/source/token/namespaces.txt (original) +++ openoffice/trunk/main/oox/source/token/namespaces.txt Fri Nov 1 05:51:39 2013 @@ -70,3 +70,4 @@ dc http://purl.org/ dcTerms http://purl.org/dc/terms/ xm http://schemas.microsoft.com/office/excel/2006/main sprmhttp://sprm +markupCompat http://schemas.openxmlformats.org/markup-compatibility/2006 Modified: openoffice/trunk/main/oox/source/token/tokens.txt URL: http://svn.apache.org/viewvc/openoffice/trunk/main/oox/source/token/tokens.txt?rev=1537831r1=1537830r2=1537831view=diff == --- openoffice/trunk/main/oox/source/token/tokens.txt (original) +++ openoffice/trunk/main/oox/source/token/tokens.txt Fri Nov 1 05:51:39 2013 @@ -37,6 +37,7 @@ AbbreviatedCaseNumber Accel Accel2 AlbumTitle +AlternateContent Always Anchor AppVersion @@ -79,6 +80,7 @@ Characters CharactersWithSpaces Checkbox Checked +Choice City ClientData ColHidden @@ -2107,6 +2109,7 @@ factor fade fadeDir fallback +Fallback false family fans
svn commit: r1536599 [5/5] - in /openoffice/branches/ia2/main: sal/rtl/source/ scp2/source/ooo/ vcl/inc/vcl/ vcl/source/app/ vcl/win/source/window/ winaccessibility/inc/ winaccessibility/source/UAccCO
Modified: openoffice/branches/ia2/main/winaccessibility/source/service/msaaservice_impl.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/service/msaaservice_impl.cxx?rev=1536599r1=1536598r2=1536599view=diff == --- openoffice/branches/ia2/main/winaccessibility/source/service/msaaservice_impl.cxx (original) +++ openoffice/branches/ia2/main/winaccessibility/source/service/msaaservice_impl.cxx Tue Oct 29 07:15:44 2013 @@ -1,30 +1,23 @@ -/* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright IBM Corporation 2010. - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * http://www.openoffice.org/license.html - * for a copy of the LGPLv3 License. - * - / +/** + * + * 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 + * regarding copyright ownership. The ASF licenses this file + * 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. + * + */ #include cppuhelper/implbase3.hxx #include cppuhelper/factory.hxx Modified: openoffice/branches/ia2/main/winaccessibility/source/service/winaccessibility.component URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/service/winaccessibility.component?rev=1536599r1=1536598r2=1536599view=diff == --- openoffice/branches/ia2/main/winaccessibility/source/service/winaccessibility.component (original) +++ openoffice/branches/ia2/main/winaccessibility/source/service/winaccessibility.component Tue Oct 29 07:15:44 2013 @@ -1,31 +1,24 @@ -?xml version=1.0 encoding=UTF-8? +?xml version=1.0 encoding=utf-8? !--** -* -* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -* -* Copyright 2000, 2010 Oracle and/or its affiliates. -* -* OpenOffice.org - a multi-platform office productivity suite -* -* This file is part of OpenOffice.org. -* -* OpenOffice.org is free software: you can redistribute it and/or modify -* it under the terms of the GNU Lesser General Public License version 3 -* only, as published by the Free Software Foundation. -* -* OpenOffice.org is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU Lesser General Public License version 3 for more details -* (a copy is included in the LICENSE file that accompanied this code). -* -* You should have received a copy of the GNU Lesser General Public License -* version 3 along with OpenOffice.org. If not, see -* http://www.openoffice.org/license.html -* for a copy of the LGPLv3 License. -* + * + * 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 + * regarding copyright ownership. The ASF licenses this file + * 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 +
svn commit: r1533029 - /openoffice/branches/ia2/main/winaccessibility/source/service/AccContainerEventListener.cxx
Author: steve_y
Date: Thu Oct 17 10:03:36 2013
New Revision: 1533029
URL: http://svn.apache.org/r1533029
Log:
Modified for Sidebar focus event
Modified:
openoffice/branches/ia2/main/winaccessibility/source/service/AccContainerEventListener.cxx
Modified:
openoffice/branches/ia2/main/winaccessibility/source/service/AccContainerEventListener.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/winaccessibility/source/service/AccContainerEventListener.cxx?rev=1533029r1=1533028r2=1533029view=diff
==
---
openoffice/branches/ia2/main/winaccessibility/source/service/AccContainerEventListener.cxx
(original)
+++
openoffice/branches/ia2/main/winaccessibility/source/service/AccContainerEventListener.cxx
Thu Oct 17 10:03:36 2013
@@ -383,7 +383,9 @@ void AccContainerEventListener::fireStat
{
//don't send focused event on PANEL OPTION_PANE if the parent is
not toolbar
short parentRole = getParentRole();
-if (parentRole == AccessibleRole::TOOL_BAR)
+if (parentRole == AccessibleRole::TOOL_BAR
+ || parentRole == AccessibleRole::SCROLL_PANE //
sidebar
+ || parentRole == AccessibleRole::PANEL) //
sidebar
pAgent-NotifyAccEvent(UM_EVENT_STATE_FOCUSED, pAccessible);
}
//to update ComboBox's description
svn commit: r1527279 [3/28] - in /openoffice/branches/ia2: ./ extras/l10n/source/ast/ extras/l10n/source/bg/ extras/l10n/source/cs/ extras/l10n/source/da/ extras/l10n/source/de/ extras/l10n/source/el/
Modified: openoffice/branches/ia2/extras/l10n/source/cs/localize.sdf URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/extras/l10n/source/cs/localize.sdf?rev=1527279r1=1527278r2=1527279view=diff == --- openoffice/branches/ia2/extras/l10n/source/cs/localize.sdf (original) +++ openoffice/branches/ia2/extras/l10n/source/cs/localize.sdf Sun Sep 29 07:19:52 2013 @@ -2153,7 +2153,7 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Commands..uno:HalfSphere Label 0 cs Polokoule 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Commands..uno:HandlesDraft Label 0 cs Jednoduché úchyty 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Commands..uno:HandoutMasterPage Label 0 cs PÅedloha podkladů 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Commands..uno:HandoutMode Label 0 cs Stránka s tezemi 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Commands..uno:HandoutMode Label 0 cs Stránka s podklady 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Commands..uno:HeaderAndFooter Label 0 cs Záhlavà a zápatÃ... 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Commands..uno:HelplinesFrontLabel 0 cs VodÃtka v popÅedà 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\DrawImpressCommands.xcu 0 value ..DrawImpressCommands.UserInterface.Commands..uno:HelplinesUse Label 0 cs PÅichytávat k vodÃtkům 20130618 17:22:18 @@ -17946,14 +17946,14 @@ helpcontent2 source\text\shared\main0201 helpcontent2 source\text\shared\main0201.xhp 0 helppar_idN10873 0 cs Co je to 20130618 17:22:18 helpcontent2 source\text\shared\main0204.xhp 0 helptit 0 cs Panel tabulky 20130618 17:22:18 helpcontent2 source\text\shared\main0204.xhp 0 helphd_id3145587 0 cs \link href=\text/shared/main0204.xhp\ name=\Table Bar\\Panel tabulky\/link\ 20130618 17:22:18 -helpcontent2 source\text\shared\main0204.xhp 0 helppar_id3154252 0 cs \ahelp hid=\.\\The \emph\Table\/emph\ Bar contains functions you need when working with tables. It appears when you move the cursor into a table.\/ahelp\ 20130618 17:22:18 -helpcontent2 source\text\shared\main0204.xhp 0 helphd_id319945759 0 cs \link href=\text/shared/01/05210100.xhp\ name=\Area Style / Filling\\Area Style / Filling\/link\20130618 17:22:18 -helpcontent2 source\text\shared\main0204.xhp 0 helphd_id3147592 6 0 cs \link href=\text/shared/01/05100100.xhp\ name=\Merge Cells\\Merge Cells\/link\ 20130618 17:22:18 -helpcontent2 source\text\shared\main0204.xhp 0 helphd_id3147820 9 0 cs \link href=\text/swriter/01/05110500.xhp\ name=\Delete Row\\Delete Row\/link\ 20130618 17:22:18 -helpcontent2 source\text\shared\main0204.xhp 0 helphd_id3147231 10 0 cs \link href=\text/swriter/01/05120500.xhp\ name=\Delete Column\\Delete Column\/link\ 20130618 17:22:18 -helpcontent2 source\text\shared\main0204.xhp 0 helphd_id3134447820 0 cs \link href=\text/simpress/01/taskpanel.xhp\ name=\Table Design\\Table Design\/link\ 20130618 17:22:18 -helpcontent2 source\text\shared\main0204.xhp 0
svn commit: r1527279 [12/28] - in /openoffice/branches/ia2: ./ extras/l10n/source/ast/ extras/l10n/source/bg/ extras/l10n/source/cs/ extras/l10n/source/da/ extras/l10n/source/de/ extras/l10n/source/el
Modified: openoffice/branches/ia2/extras/l10n/source/it/localize.sdf URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/extras/l10n/source/it/localize.sdf?rev=1527279r1=1527278r2=1527279view=diff == --- openoffice/branches/ia2/extras/l10n/source/it/localize.sdf (original) +++ openoffice/branches/ia2/extras/l10n/source/it/localize.sdf Sun Sep 29 07:19:52 2013 @@ -8728,7 +8728,7 @@ framework source\classes\resource.src 0 framework source\classes\resource.src 0 string STR_LANGSTATUS_MULTIPLE_LANGUAGES 0 it Più lingue 20130618 17:22:18 framework source\classes\resource.src 0 string STR_LANGSTATUS_NONE 0 it Nessuna (non eseguire il controllo ortografico) 20130618 17:22:18 framework source\classes\resource.src 0 string STR_RESET_TO_DEFAULT_LANGUAGE 0 it Ripristina la lingua predefinita20130618 17:22:18 -framework source\classes\resource.src 0 string STR_LANGSTATUS_MORE 0 it Extra... 20130618 17:22:18 +framework source\classes\resource.src 0 string STR_LANGSTATUS_MORE 0 it Altra lingua... 20130618 17:22:18 framework source\classes\resource.src 0 string STR_SET_LANGUAGE_FOR_SELECTION 0 it Imposta la lingua per la selezione 20130618 17:22:18 framework source\classes\resource.src 0 string STR_SET_LANGUAGE_FOR_PARAGRAPH 0 it Imposta la lingua per il paragrafo 20130618 17:22:18 framework source\classes\resource.src 0 string STR_SET_LANGUAGE_FOR_ALL_TEXT 0 it Imposta la lingua per tutto il testo20130618 17:22:18 @@ -14703,7 +14703,7 @@ sd source\ui\view\DocumentRenderer.src 0 sd source\ui\view\DocumentRenderer.src 0 itemlist _STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES 1 0 it Diapositive 20130618 17:22:18 sd source\ui\view\DocumentRenderer.src 0 itemlist _STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES 2 0 it Stampati 20130618 17:22:18 sd source\ui\view\DocumentRenderer.src 0 itemlist _STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES 3 0 it Note20130618 17:22:18 -sd source\ui\view\DocumentRenderer.src 0 itemlist _STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES 4 0 it Contorno 20130618 17:22:18 +sd source\ui\view\DocumentRenderer.src 0 itemlist _STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_CONTENT_CHOICES 4 0 it Struttura 20130618 17:22:18 sd source\ui\view\DocumentRenderer.src 0 string _STR_IMPRESS_PRINT_UI_OPTIONS _STR_IMPRESS_PRINT_UI_SLIDESPERPAGE 0 it Diapositive per pagina 20130618 17:22:18 sd source\ui\view\DocumentRenderer.src 0 itemlist _STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES 1 0 it Predefinito 20130618 17:22:18 sd source\ui\view\DocumentRenderer.src 0 itemlist _STR_IMPRESS_PRINT_UI_OPTIONS._STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES 2 0 it 1 20130618 17:22:18 @@ -65385,7 +65385,7 @@ sw source\ui\lingu\olmenu.src 0 string S sw source\ui\lingu\olmenu.src 0 string STR_HYP_OK 0 it La sillabazione è conclusa! 20130618 17:22:18 sw source\ui\lingu\olmenu.src 0 string STR_LANGSTATUS_NONE 0 it Nessuno (non controllare l'ortografia) 20130618 17:22:18 sw source\ui\lingu\olmenu.src 0 string STR_RESET_TO_DEFAULT_LANGUAGE 0 it Ripristina la lingua predefinita20130618 17:22:18 -sw source\ui\lingu\olmenu.src 0 string STR_LANGSTATUS_MORE
svn commit: r1527279 [9/28] - in /openoffice/branches/ia2: ./ extras/l10n/source/ast/ extras/l10n/source/bg/ extras/l10n/source/cs/ extras/l10n/source/da/ extras/l10n/source/de/ extras/l10n/source/el/
Modified: openoffice/branches/ia2/extras/l10n/source/fi/localize.sdf URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/extras/l10n/source/fi/localize.sdf?rev=1527279r1=1527278r2=1527279view=diff == --- openoffice/branches/ia2/extras/l10n/source/fi/localize.sdf (original) +++ openoffice/branches/ia2/extras/l10n/source/fi/localize.sdf Sun Sep 29 07:19:52 2013 @@ -3634,7 +3634,7 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.DeckList.SlideTransitionDeck Title 0 fi Dian vaihtuminen20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.DeckList.NavigatorDeckTitle 0 fi Rakenneselain 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.DeckList.StyleListDeckTitle 0 fi Tyylit ja muotoilu 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.DeckList.FunctionsDeckTitle 0 fi Toiminnot 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.DeckList.FunctionsDeckTitle 0 fi Funktiot20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.PanelList.TextPropertyPanel Title 0 fi Teksti 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.PanelList.ContextPanelTitle 0 fi Käsiteltävä sisältö (vain virheenjäljitykseen) 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.PanelList.PagePropertyPanel Title 0 fi Sivu20130618 17:22:18 @@ -3661,7 +3661,7 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.PanelList.ScNavigatorPanelTitle 0 fi Rakenneselain 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.PanelList.SdNavigatorPanelTitle 0 fi Rakenneselain 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.PanelList.StyleListPanel Title 0 fi Tyylit ja muotoilu 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.PanelList.FunctionsPanel Title 0 fi Toiminnot 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.PanelList.FunctionsPanel Title 0 fi Funktiot20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Sidebar.xcu 0 value ..Sidebar.Content.PanelList.InsertPropertyPanel Title 0 fi Lisää kuvioita20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\StartModuleWindowState.xcu 0 value ..StartModuleWindowState.UIElements.States.private:resource/toolbar/standardbar UIName 0 fi Oletus 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\WriterCommands.xcu 0 value ..WriterCommands.UserInterface.Commands..uno:AcceptChange Label 0 fi Hyväksy muutos 20130618 17:22:18 @@ -9961,11 +9961,11 @@ cui source\tabpages\page.src0 itemlist cuisource\tabpages\page.src0 itemlist RID_SVXSTRARY_PAPERSIZE_STD 29 0 fi Nro 12 kirjekuori 20130618 17:22:18 cuisource\tabpages\page.src0 itemlist RID_SVXSTRARY_PAPERSIZE_DRAW1 0 fi A5 20130618 17:22:18 cuisource\tabpages\page.src
svn commit: r1527279 [28/28] - in /openoffice/branches/ia2: ./ extras/l10n/source/ast/ extras/l10n/source/bg/ extras/l10n/source/cs/ extras/l10n/source/da/ extras/l10n/source/de/ extras/l10n/source/el
Modified:
openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/vcl/Tester.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/vcl/Tester.java?rev=1527279r1=1527278r2=1527279view=diff
==
---
openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/vcl/Tester.java
(original)
+++
openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/vcl/Tester.java
Sun Sep 29 07:19:52 2013
@@ -102,13 +102,23 @@ public class Tester {
robot.mousePress(InputEvent.BUTTON1_MASK);
int x = fromX;
int y = fromY;
+ // get the direction
int dx = toX fromX ? 1 : -1;
int dy = toY fromY ? 1 : -1;
+ // get the step sizes
+ final int stepTarget = 10;
+ int sx = (toX - fromX) / stepTarget;
+ int sy = (toY - fromY) / stepTarget;
+ if( sx == 0) sx = dx;
+ if( sy == 0) sy = dy;
while (x != toX || y != toY) {
- if (x != toX)
- x = x + dx;
- if (y != toY)
- y = y + dy;
+ x += sx;
+ y += sy;
+ // limit drag pos to target pos
+ if( ((x - toX) * dx) 0)
+ x = toX;
+ if( ((y - toY) * dy) 0)
+ y = toY;
robot.mouseMove(x, y);
}
robot.mouseRelease(InputEvent.BUTTON1_MASK);
Modified:
openoffice/branches/ia2/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java?rev=1527279r1=1527278r2=1527279view=diff
==
---
openoffice/branches/ia2/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java
(original)
+++
openoffice/branches/ia2/test/testgui/source/fvt/gui/sd/shape/ShapeTypes.java
Sun Sep 29 07:19:52 2013
@@ -60,11 +60,11 @@ public class ShapeTypes {
@After
public void tearDown() throws Exception {
- sleep(3);
//close navigator
if (sdNavigatorDlg.exists()) {
app.dispatch(.uno:Navigator);
}
+ AppTool.discard();
app.stop();
}
@@ -78,6 +78,7 @@ public class ShapeTypes {
impress.focus();
//before insert CallOut Shape
sdNavigator.focus();
+ sdNavigator.waitForEnabled( 2.0, 0.1);
sdNavigatorShapeFilter.click();
typeKeys(downdown);
typeKeys(enter);
@@ -91,6 +92,7 @@ public class ShapeTypes {
impress.focus();
impress.drag(100, 100, 200, 200);
sdNavigatorDlg.focus();
+ sdNavigator.waitForEnabled( 2.0, 0.1);
sdNavigatorShapeFilter.click();
typeKeys(downdown);
typeKeys(enter);
@@ -99,9 +101,8 @@ public class ShapeTypes {
typeKeys(enter);
allShapes=sdNavigator.getAllItemsText();
assertEquals(4, allShapes.length);
-
-
}
+
/**
* Insert a new Star shape
* @throws Exception
@@ -112,6 +113,7 @@ public class ShapeTypes {
impress.focus();
//before insert CallOut Shape
sdNavigator.focus();
+ sdNavigator.waitForEnabled( 2.0, 0.1);
sdNavigatorShapeFilter.click();
typeKeys(downdown);
typeKeys(enter);
@@ -125,6 +127,7 @@ public class ShapeTypes {
impress.focus();
impress.drag(100, 100, 200, 200);
sdNavigatorDlg.focus();
+ sdNavigator.waitForEnabled( 2.0, 0.1);
sdNavigatorShapeFilter.click();
typeKeys(downdown);
typeKeys(enter);
@@ -133,7 +136,6 @@ public class ShapeTypes {
typeKeys(enter);
allShapes=sdNavigator.getAllItemsText();
assertEquals(4, allShapes.length);
-
}
}
Modified:
openoffice/branches/ia2/test/testgui/source/svt/gui/sc/BasicFuncOnCalc.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/test/testgui/source/svt/gui/sc/BasicFuncOnCalc.java?rev=1527279r1=1527278r2=1527279view=diff
==
--- openoffice/branches/ia2/test/testgui/source/svt/gui/sc/BasicFuncOnCalc.java
(original)
+++ openoffice/branches/ia2/test/testgui/source/svt/gui/sc/BasicFuncOnCalc.java
Sun Sep 29 07:19:52 2013
@@ -64,6 +64,7 @@
svn commit: r1527279 [16/28] - in /openoffice/branches/ia2: ./ extras/l10n/source/ast/ extras/l10n/source/bg/ extras/l10n/source/cs/ extras/l10n/source/da/ extras/l10n/source/de/ extras/l10n/source/el
Modified: openoffice/branches/ia2/extras/l10n/source/pt-BR/localize.sdf URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/extras/l10n/source/pt-BR/localize.sdf?rev=1527279r1=1527278r2=1527279view=diff == --- openoffice/branches/ia2/extras/l10n/source/pt-BR/localize.sdf (original) +++ openoffice/branches/ia2/extras/l10n/source/pt-BR/localize.sdf Sun Sep 29 07:19:52 2013 @@ -48776,13 +48776,13 @@ helpcontent2 source\text\shared\guide\si helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help bm_id0010 0 pt-BR \bookmark_value\Barra lateral\/bookmark_value\ 20130618 17:22:18 helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help hd_id0100 0 pt-BR Janela da barra lateral 20130618 17:22:18 helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help par_id0001 0 pt-BR \ahelp hid=\SFX2_HID_SIDEBAR_WINDOW\\A barra lateral (Sidebar) disponibiliza ferramentas utilizadas mais frequentemente, agrupadas em painéis. Clique num separador da barra vertical para escolher um painel.\/ahelp\ 20130618 17:22:18 -helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help hd_id0200 0 pt-BR Tab Bar 20130618 17:22:18 -helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help hd_id0300 0 pt-BR Configuration Menu Button 20130618 17:22:18 -helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help par_id1001 0 pt-BR \image id=\img_id1002\ src=\sfx2/res/symphony/open_more.png\ width=\0.25in\ height=\0.25in\\\alt id=\alt_id1002\\Configuration Menu\/alt\\/image\ 20130618 17:22:18 -helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help par_id1003 0 pt-BR The drop-down list of the configuration menu button has two parts. 20130618 17:22:18 -helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help par_id1004 0 pt-BR Choose an item in the upper part of the list to switch between the currently available panel decks. 20130618 17:22:18 -helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help par_id1005 0 pt-BR To undock or dock the sidebar window use the \item type=\menuitem\\Undock\/item\ or \item type=\menuitem\\Dock\/item\ item respectively. 20130618 17:22:18 -helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help par_id1006 0 pt-BR Use the sub-list of the item \item type=\menuitem\\Customization\/item\ to enable or disable a deck or to restore the default configuration. 20130618 17:22:18 +helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help hd_id0200 0 pt-BR Barra de abas 20130618 17:22:18 +helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help hd_id0300 0 pt-BR Botão de configuração de Menu20130618 17:22:18 +helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help par_id1001 0 pt-BR \image id=\img_id1002\ src=\sfx2/res/symphony/open_more.png\ width=\0.25in\ height=\0.25in\\\alt id=\alt_id1002\\Menu de Configuração\/alt\\/image\ 20130618 17:22:18 +helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help par_id1003 0 pt-BR A lista pendente do Botão Configuração de Menu tem duas partes 20130618 17:22:18 +helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help par_id1004 0 pt-BR Escolha um item na parte superior da lista para alternar entre os painéis atualmente disponÃveis. 20130618 17:22:18 +helpcontent2 source\text\shared\guide\sidebar_window.xhp 0 help par_id1005 0 pt-BR Para desbloquear ou bloquear a janela da Barra lateral utilize respectivamente os itens \item type=\menuitem\\Desbloquear\/item\ ou \item type=\menuitem\\Bloquear\/item\ . 20130618 17:22:18 +helpcontent2 source\text\shared\guide\sidebar_window.xhp 0
svn commit: r1527279 [18/28] - in /openoffice/branches/ia2: ./ extras/l10n/source/ast/ extras/l10n/source/bg/ extras/l10n/source/cs/ extras/l10n/source/da/ extras/l10n/source/de/ extras/l10n/source/el
Modified: openoffice/branches/ia2/extras/l10n/source/sk/localize.sdf URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/extras/l10n/source/sk/localize.sdf?rev=1527279r1=1527278r2=1527279view=diff == --- openoffice/branches/ia2/extras/l10n/source/sk/localize.sdf (original) +++ openoffice/branches/ia2/extras/l10n/source/sk/localize.sdf Sun Sep 29 07:19:52 2013 @@ -2604,7 +2604,7 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.cut-through-black Label 0 sk Prestrihnúť cez Äiernu 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.dissolveLabel 0 sk PrelÃnaÅ¥ 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.fade-smoothly Label 0 sk Jemne vyblednúť 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.fade-through-black Label 0 sk Vyblednúť cez Äiernu 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.fade-through-black Label 0 sk ObjaviÅ¥ sa z Äiernej 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.zoom-rotate-in Label 0 sk Novynový blesk 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.push-down Label 0 sk ZatlaÄiÅ¥ dole 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.push-left Label 0 sk ZatlaÄiÅ¥ vľavo 20130618 17:22:18 @@ -2619,10 +2619,10 @@ officecfg registry\data\org\openoffice\O officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.split-horizontal-outLabel 0 sk RozdeliÅ¥ vodorovne von 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.split-vertical-in Label 0 sk RozdeliÅ¥ zvisle dnu 20130618 17:22:18 officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.split-vertical-out Label 0 sk RozdeliÅ¥ zvisle von 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.diagonal-squares-left-down Label 0 sk UhloprieÄne Å¡tvorce zľava do dola 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.diagonal-squares-left-upLabel 0 sk UhloprieÄne Å¡tvorce zľava do hora 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.diagonal-squares-right-down Label 0 sk UhloprieÄne Å¡tvorce sprava do dola 20130618 17:22:18 -officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.diagonal-squares-right-up Label 0 sk UhloprieÄne Å¡tvorce sprava do hora 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.diagonal-squares-left-down Label 0 sk Å tvorce Å¡ikmo zľava dole 20130618 17:22:18 +officecfg registry\data\org\openoffice\Office\UI\Effects.xcu 0 value ..Effects.UserInterface.Transitions.diagonal-squares-left-upLabel 0 sk Å tvorce Å¡ikmo zľava hore 20130618 17:22:18 +officecfg
svn commit: r1527279 [7/28] - in /openoffice/branches/ia2: ./ extras/l10n/source/ast/ extras/l10n/source/bg/ extras/l10n/source/cs/ extras/l10n/source/da/ extras/l10n/source/de/ extras/l10n/source/el/
Modified: openoffice/branches/ia2/extras/l10n/source/es/localize.sdf URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/extras/l10n/source/es/localize.sdf?rev=1527279r1=1527278r2=1527279view=diff == --- openoffice/branches/ia2/extras/l10n/source/es/localize.sdf (original) +++ openoffice/branches/ia2/extras/l10n/source/es/localize.sdf Sun Sep 29 07:19:52 2013 @@ -5433,7 +5433,7 @@ scsource\ui\dbgui\pvfundlg.src0 string sc source\ui\dbgui\pvfundlg.src0 checkbox RID_SCDLG_DPSUBTOTAL_OPTCB_LAYOUT_EMPTY 186 es ~LÃnea vacÃa después de cada Ãtem 20130618 17:22:18 sc source\ui\dbgui\pvfundlg.src0 fixedline RID_SCDLG_DPSUBTOTAL_OPTFL_AUTOSHOW 198 es Mostrar automáticamente20130618 17:22:18 sc source\ui\dbgui\pvfundlg.src0 checkbox RID_SCDLG_DPSUBTOTAL_OPTCB_SHOW 70 es ~Mostrar20130618 17:22:18 -sc source\ui\dbgui\pvfundlg.src0 fixedtext RID_SCDLG_DPSUBTOTAL_OPTFT_SHOW 80 es Ãtemes 20130618 17:22:18 +sc source\ui\dbgui\pvfundlg.src0 fixedtext RID_SCDLG_DPSUBTOTAL_OPTFT_SHOW 80 es Ãtems 20130618 17:22:18 sc source\ui\dbgui\pvfundlg.src0 fixedtext RID_SCDLG_DPSUBTOTAL_OPTFT_SHOW_FROM60 es ~Desde 20130618 17:22:18 sc source\ui\dbgui\pvfundlg.src0 stringlist RID_SCDLG_DPSUBTOTAL_OPT.LB_SHOW_FROM 1 0 es Superior20130618 17:22:18 sc source\ui\dbgui\pvfundlg.src0 stringlist RID_SCDLG_DPSUBTOTAL_OPT.LB_SHOW_FROM 2 0 es Inferior20130618 17:22:18 @@ -6377,7 +6377,7 @@ scsource\ui\src\globstr.src 0 string RI sc source\ui\src\globstr.src 0 string RID_GLOBSTR STR_DPFIELD_GROUP_BY_HOURS 0 es Horas 20130618 17:22:18 sc source\ui\src\globstr.src 0 string RID_GLOBSTR STR_DPFIELD_GROUP_BY_DAYS 0 es DÃas 20130618 17:22:18 sc source\ui\src\globstr.src 0 string RID_GLOBSTR STR_DPFIELD_GROUP_BY_MONTHS 0 es Meses 20130618 17:22:18 -sc source\ui\src\globstr.src 0 string RID_GLOBSTR STR_DPFIELD_GROUP_BY_QUARTERS 0 es Cuatrimestres 20130618 17:22:18 +sc source\ui\src\globstr.src 0 string RID_GLOBSTR STR_DPFIELD_GROUP_BY_QUARTERS 0 es Trimestres 20130618 17:22:18 sc source\ui\src\globstr.src 0 string RID_GLOBSTR STR_DPFIELD_GROUP_BY_YEARS 0 es Años 20130618 17:22:18 sc source\ui\src\hdrcont.src 0 menuitemPART1 FID_CELL_FORMAT CMD_FID_CELL_FORMAT 0 es ~Formatear celdas...20130618 17:22:18 sc source\ui\src\hdrcont.src 0 menuitemPART2 SID_CUT CMD_SID_CUT 0 es Co~rtar 20130618 17:22:18 @@ -9290,7 +9290,7 @@ cui source\customize\macropg.src0 strin cuisource\customize\macropg.src0 string RID_SVXSTR_EVENT_ADJUSTMENTVALUECHANGED 0 es Al ajustar 20130618 17:22:18 cuisource\customize\macropg.src0 string RID_SVXSTR_EVENT_FOCUSGAINED0 es Recepción de foco 20130618 17:22:18 cuisource\customize\macropg.src0 string RID_SVXSTR_EVENT_FOCUSLOST 0 es Al perder el foco 20130618 17:22:18 -cuisource\customize\macropg.src0 string RID_SVXSTR_EVENT_ITEMSTATECHANGED 0 es Estado modificado 20130618 17:22:18 +cuisource\customize\macropg.src0 string RID_SVXSTR_EVENT_ITEMSTATECHANGED 0 es Estado del Ãtem modificado 20130618 17:22:18 cuisource\customize\macropg.src0 string RID_SVXSTR_EVENT_KEYTYPED 0 es Tecla pulsada
svn commit: r1526782 [6/6] - in /openoffice/branches/ia2/main: accessibility/source/extended/ accessibility/source/standard/ cui/source/customize/ cui/source/inc/ editeng/inc/editeng/ editeng/source/a
Modified: openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx?rev=1526782r1=1526781r2=1526782view=diff
==
--- openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx Fri Sep 27
03:21:44 2013
@@ -1625,7 +1625,7 @@ vos::OGuard aGuard(Application::GetSolar
// already get the caret postion
- // Sym2_5073, modified by Steve Yin
+ //IAccessibility2 Implementation 2009-
/*SwFrm* pTFrm = const_castSwFrm*(GetFrm());
com::sun::star::uno::Sequence ::com::sun::star::style::TabStop tabs
=
pTFrm-GetTabStopInfo(aCoreRect.Left());*/
@@ -1637,7 +1637,7 @@ vos::OGuard aGuard(Application::GetSolar
SwFrm* pTFrm = const_castSwFrm*(GetFrm());
tabs = pTFrm-GetTabStopInfo(aCoreRect.Left());
}
- // Sym2_5073
+ //-IAccessibility2 Implementation 2009
if( tabs.hasElements() )
{
@@ -3458,7 +3458,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
}
//IAccessibility2 Implementation 2009-
- // Added by qiuhd, 2007/02/28, for SODC_6986
/* Can't fin the function GetTOCFirstWordEndIndex declaration in
sym2.0 (Added by yanjun)
if( GetTOXSortTabBase() )
{
@@ -3467,7 +3466,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
nCount++;
}
*/
- // End by qiuhd, 2007/02/28, for SODC_6986
//-IAccessibility2 Implementation 2009
return nCount;
}
@@ -3489,7 +3487,6 @@ uno::Reference XAccessibleHyperlink S
sal_Int32 nARCount = 0;
sal_Int32 nARIndex = 0;
sal_Int32 nTIndex = -1;
- // Added by qiuhd, 2007/02/28, for SODC_6986
sal_Int32 nTOCEndIndex = -1;
SwTxtNode* pNode = NULL;
SwTOXSortTabBase* pTBase = GetTOXSortTabBase();
@@ -3500,15 +3497,12 @@ uno::Reference XAccessibleHyperlink S
nTOCEndIndex = -1;
//if(pNode)
// nTOCEndIndex = pNode-GetTOCFirstWordEndIndex();
- // End by qiuhd, 2007/02/28, for SODC_6986
SwTxtAttr* pHt = (SwTxtAttr*)(aHIter.next());
while( (nLinkIndex getHyperLinkCount()) nTIndex nLinkIndex)
{
// no candidates, exit
- // modified by qiuhd, 2007/02/28, for SODC_6986
//if( (!pHt) (nARIndex = nARCount) nTOCEndIndex = 0)
// break;
- // end by qiuhd, 2007/02/28, for SODC_6986
sal_Int32 nHStt = -1;
sal_Int32 nAStt = -1;
@@ -3525,15 +3519,13 @@ uno::Reference XAccessibleHyperlink S
aARHelper.getPosition( nARIndex, nAStt, nAEnd );
*/
}
- // Added by qiuhd, 2007/02/28, for SODC_6986
sal_Bool bTOC = sal_False;
// Inside TOC get the first link
if( pTBase nTIndex == -1 )
{
nTIndex++;
bTOC = sal_True;
- }
- // End by qiuhd, 2007/02/28, for SODC_6986
+ }
else
{
if( nHStt =0 nAStt =0 )
@@ -3562,8 +3554,6 @@ uno::Reference XAccessibleHyperlink S
{ // it's a hyperlink
if( pHt )
{
-
- // Added by Zijie Jia ,9/8/2006 ,
CR_ID:SODC_5061
//const SwField* pFFld = pHt-GetFld().GetFld();
{
if( !pHyperTextData )
@@ -3597,12 +3587,10 @@ uno::Reference XAccessibleHyperlink S
}
}
}
- // Added by qiuhd, 2007/02/28, for SODC_6986
else if( bTOC )
{
//xRet = new SwAccessibleTOCLink( this );
}
- // End by qiuhd, 2007/02/28, for SODC_6986
else if( bA )
{
/*
@@ -3727,7 +3715,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
nRet = nPos;
}
//IAccessibility2 Implementation 2009-
- // Added by qiuhd, 2007/02/28, for SODC_6986
/* Added by yanjun for acc miagration
if( nRet == -1 GetTOXSortTabBase() )
{
@@ -3736,7 +3723,6 @@ sal_Int32 SAL_CALL SwAccessibleParagraph
nRet = 0;
}
*/
- // End by qiuhd, 2007/02/28, for SODC_6986
if (nRet
svn commit: r1519381 - in /openoffice/branches/ia2: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/win/ ext_sources/ extras/l10n/source/ast/
Author: steve_y Date: Mon Sep 2 10:21:45 2013 New Revision: 1519381 URL: http://svn.apache.org/r1519381 Log: Merged with the trunk. [This commit notification would consist of 52 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.]
svn commit: r1484083 [9/17] - in /openoffice/branches/ia2: ./ ext_libraries/apr/prj/ ext_libraries/coinmp/prj/ ext_libraries/ratscan/prj/ ext_libraries/serf/prj/ main/ main/avmedia/source/quicktime/ m
Modified:
openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx?rev=1484083r1=1484082r2=1484083view=diff
==
--- openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx
(original)
+++ openoffice/branches/ia2/main/svgio/source/svgreader/svgstyleattributes.cxx
Sat May 18 10:12:43 2013
@@ -318,10 +318,11 @@ namespace svgio
if(!aSvgGradientEntryVector.empty())
{
basegfx::B2DHomMatrix aGeoToUnit;
+basegfx::B2DHomMatrix aGradientTransform;
if(rFillGradient.getGradientTransform())
{
-aGeoToUnit = *rFillGradient.getGradientTransform();
+aGradientTransform = *rFillGradient.getGradientTransform();
}
if(userSpaceOnUse == rFillGradient.getGradientUnits())
@@ -366,6 +367,7 @@ namespace svgio
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(
rTarget,
new
drawinglayer::primitive2d::SvgLinearGradientPrimitive2D(
+aGradientTransform,
rPath,
aSvgGradientEntryVector,
aStart,
@@ -427,6 +429,7 @@ namespace svgio
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(
rTarget,
new
drawinglayer::primitive2d::SvgRadialGradientPrimitive2D(
+aGradientTransform,
rPath,
aSvgGradientEntryVector,
aStart,
@@ -1184,7 +1187,7 @@ namespace svgio
{
}
-void SvgStyleAttributes::parseStyleAttribute(const rtl::OUString
/*rTokenName*/, SVGToken aSVGToken, const rtl::OUString aContent)
+void SvgStyleAttributes::parseStyleAttribute(const rtl::OUString /*
rTokenName */, SVGToken aSVGToken, const rtl::OUString aContent)
{
switch(aSVGToken)
{
@@ -1788,6 +1791,18 @@ namespace svgio
readLocalUrl(aContent, maMarkerEndXLink);
break;
}
+case SVGTokenDisplay:
+{
+// There may be display:none statements inside of style
defines, e.g. the following line:
+// style=display:none
+// taken from a svg example; this needs to be parsed and
set at the owning node. Do not call
+// mrOwner.parseAttribute(...) here, this would lead to a
recursion
+if(aContent.getLength())
+{
+mrOwner.setDisplay(getDisplayFromContent(aContent));
+}
+break;
+}
default:
{
break;
Modified:
openoffice/branches/ia2/main/svtools/inc/svtools/accessibilityoptions.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/inc/svtools/accessibilityoptions.hxx?rev=1484083r1=1484082r2=1484083view=diff
==
--- openoffice/branches/ia2/main/svtools/inc/svtools/accessibilityoptions.hxx
(original)
+++ openoffice/branches/ia2/main/svtools/inc/svtools/accessibilityoptions.hxx
Sat May 18 10:12:43 2013
@@ -64,6 +64,15 @@ public:
// is in a ListBox, all will be shown, else a ScrollBar will be used
sal_Int16 GetListBoxMaximumLineCount() const;
+// option to set the width of ColorValueSets in columns; this allows
+// adaption to own colr set layouts. The default layout is 12 columns and
should
+// only be changed when the color palette is changed from the default
+sal_Int16 GetColorValueSetColumnCount() const;
+
+// option to make previews show the content with a checkeded background to
allow
+// simple identification and better preview of transparent content
+sal_BoolGetPreviewUsesCheckeredBackground() const;
+
voidSetIsForPagePreviews(sal_Bool bSet);
voidSetIsHelpTipsDisappear(sal_Bool bSet);
voidSetIsAllowAnimatedGraphics(sal_Bool bSet);
@@ -76,6 +85,8 @@ public:
voidSetEdgeBlending(sal_Int16 nSet);
voidSetListBoxMaximumLineCount(sal_Int16 nSet);
+voidSetColorValueSetColumnCount(sal_Int16 nSet);
+voidSetPreviewUsesCheckeredBackground(sal_Bool bSet);
sal_BoolIsModified() const;
voidCommit();
Modified:
openoffice/branches/ia2/main/svtools/source/config/accessibilityoptions.cxx
svn commit: r1476721 - /openoffice/branches/ia2/main/editeng/prj/build.lst
Author: steve_y Date: Sun Apr 28 06:22:18 2013 New Revision: 1476721 URL: http://svn.apache.org/r1476721 Log: Fix a build dependency issue in editeng Modified: openoffice/branches/ia2/main/editeng/prj/build.lst Modified: openoffice/branches/ia2/main/editeng/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/prj/build.lst?rev=1476721r1=1476720r2=1476721view=diff == --- openoffice/branches/ia2/main/editeng/prj/build.lst (original) +++ openoffice/branches/ia2/main/editeng/prj/build.lst Sun Apr 28 06:22:18 2013 @@ -1,3 +1,3 @@ -ed editeng : L10N:l10n svtools xmloff linguistic NULL +ed editeng : L10N:l10n svtools sfx2 xmloff linguistic NULL ed editeng\prj nmake - all ed_prj NULL
svn commit: r1476794 - in /openoffice/branches/ia2/main/editeng: prj/build.lst source/accessibility/AccessibleEditableTextPara.cxx
Author: steve_y Date: Sun Apr 28 16:40:17 2013 New Revision: 1476794 URL: http://svn.apache.org/r1476794 Log: Removed the unused headers in editeng/source/accessibility/AccessibleEditableTextPara.cxx and reversed editeng/prj/build.lst. From Ariel Constenla-Haile arie...@apache.org. Modified: openoffice/branches/ia2/main/editeng/prj/build.lst openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx Modified: openoffice/branches/ia2/main/editeng/prj/build.lst URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/prj/build.lst?rev=1476794r1=1476793r2=1476794view=diff == --- openoffice/branches/ia2/main/editeng/prj/build.lst (original) +++ openoffice/branches/ia2/main/editeng/prj/build.lst Sun Apr 28 16:40:17 2013 @@ -1,3 +1,3 @@ -ed editeng : L10N:l10n svtools sfx2 xmloff linguistic NULL +ed editeng : L10N:l10n svtools xmloff linguistic NULL ed editeng\prj nmake - all ed_prj NULL Modified: openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx?rev=1476794r1=1476793r2=1476794view=diff == --- openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx (original) +++ openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx Sun Apr 28 16:40:17 2013 @@ -84,8 +84,6 @@ using namespace std; //-IAccessibility2 Implementation 2009 #include editeng/numitem.hxx -#include sfx2/viewfrm.hxx -#include sfx2/viewsh.hxx using namespace ::com::sun::star; using namespace ::com::sun::star::beans;
svn commit: r1476499 [9/9] - in /openoffice/branches/ia2: ./ ext_libraries/hunspell/ main/bridges/source/cpp_uno/gcc3_freebsd_x86-64/ main/bridges/source/cpp_uno/gcc3_linux_x86-64/ main/chart2/source/
Modified: openoffice/branches/ia2/main/vcl/source/control/lstbox.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/control/lstbox.cxx?rev=1476499r1=1476498r2=1476499view=diff
==
--- openoffice/branches/ia2/main/vcl/source/control/lstbox.cxx (original)
+++ openoffice/branches/ia2/main/vcl/source/control/lstbox.cxx Sat Apr 27
05:51:13 2013
@@ -99,11 +99,11 @@ void ListBox::ImplInitListBoxData()
mpFloatWin = NULL;
mpImplWin = NULL;
mpBtn = NULL;
-
mnDDHeight = 0;
- mbDDAutoSize= sal_True;
mnSaveValue = LISTBOX_ENTRY_NOTFOUND;
mnLineCount = 0;
+ mbDDAutoSize= true;
+mbEdgeBlending = false;
}
// ---
@@ -152,13 +152,13 @@ void ListBox::ImplInit( Window* pParent,
mpImplWin-SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl
) );
mpImplWin-Show();
mpImplWin-GetDropTarget()-addDropTargetListener(xDrop);
+mpImplWin-SetEdgeBlending(GetEdgeBlending());
mpBtn = new ImplBtn( this, WB_NOLIGHTBORDER | WB_RECTSTYLE );
ImplInitDropDownButton( mpBtn );
mpBtn-SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) );
mpBtn-Show();
mpBtn-GetDropTarget()-addDropTargetListener(xDrop);
-
}
Window* pLBParent = this;
@@ -175,6 +175,7 @@ void ListBox::ImplInit( Window* pParent,
mpImplLB-SetListItemSelectHdl( LINK( this, ListBox,
ImplListItemSelectHdl ) );
//-IAccessibility2 Implementation 2009
mpImplLB-SetPosPixel( Point() );
+mpImplLB-SetEdgeBlending(GetEdgeBlending());
mpImplLB-Show();
mpImplLB-GetDropTarget()-addDropTargetListener(xDrop);
@@ -600,15 +601,20 @@ void ListBox::DataChanged( const DataCha
// ---
-void ListBox::EnableAutoSize( sal_Bool bAuto )
+void ListBox::EnableAutoSize( bool bAuto )
{
mbDDAutoSize = bAuto;
if ( mpFloatWin )
{
if ( bAuto !mpFloatWin-GetDropDownLineCount() )
- mpFloatWin-SetDropDownLineCount( 5 );
+{
+// use GetListBoxMaximumLineCount here; before, was on fixed
number of five
+AdaptDropDownLineCountToMaximum();
+}
else if ( !bAuto )
+{
mpFloatWin-SetDropDownLineCount( 0 );
+}
}
}
@@ -638,6 +644,14 @@ void ListBox::SetDropDownLineCount( sal_
// ---
+void ListBox::AdaptDropDownLineCountToMaximum()
+{
+// adapt to maximum allowed number
+SetDropDownLineCount(std::min(GetEntryCount(),
GetSettings().GetStyleSettings().GetListBoxMaximumLineCount()));
+}
+
+// ---
+
sal_uInt16 ListBox::GetDropDownLineCount() const
{
if ( mpFloatWin )
@@ -1662,6 +1676,37 @@ const Wallpaper ListBox::GetDisplayBack
return mpImplLB-GetDisplayBackground();
}
+// ---
+
+void ListBox::SetEdgeBlending(bool bNew)
+{
+if(mbEdgeBlending != bNew)
+{
+mbEdgeBlending = bNew;
+
+if(IsDropDownBox())
+{
+mpImplWin-Invalidate();
+}
+else
+{
+mpImplLB-Invalidate();
+}
+
+if(mpImplWin)
+{
+mpImplWin-SetEdgeBlending(GetEdgeBlending());
+}
+
+if(mpImplLB)
+{
+mpImplLB-SetEdgeBlending(GetEdgeBlending());
+}
+
+Invalidate();
+}
+}
+
// ===
MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) :
ListBox( WINDOW_MULTILISTBOX )
@@ -1684,3 +1729,4 @@ MultiListBox::MultiListBox( Window* pPar
Show();
EnableMultiSelection( sal_True );
}
+
Modified: openoffice/branches/ia2/main/vcl/source/gdi/metaact.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/gdi/metaact.cxx?rev=1476499r1=1476498r2=1476499view=diff
==
--- openoffice/branches/ia2/main/vcl/source/gdi/metaact.cxx (original)
+++ openoffice/branches/ia2/main/vcl/source/gdi/metaact.cxx Sat Apr 27 05:51:13
2013
@@ -4104,20 +4104,34 @@ void MetaCommentAction::Move( long nXMov
{
SvtGraphicStroke aStroke;
aMemStm aStroke;
- Polygon aPath;
+
+Polygon aPath;
svn commit: r1470868 [35/40] - in /openoffice/branches/ia2: ./ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/win/ extras/l10n/source/fi/ main/ main/animations/source/animcore/ main/auto
Modified: openoffice/branches/ia2/main/sw/source/ui/shells/txtnum.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/shells/txtnum.cxx?rev=1470868r1=1470867r2=1470868view=diff
==
--- openoffice/branches/ia2/main/sw/source/ui/shells/txtnum.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/shells/txtnum.cxx Tue Apr 23
09:51:15 2013
@@ -46,6 +46,11 @@
#include swabstdlg.hxx
#include globals.hrc
#include sfx2/tabdlg.hxx
+#include svx/nbdtmg.hxx
+#include svx/nbdtmgfact.hxx
+#include sfx2/viewfrm.hxx
+#include sfx2/bindings.hxx
+using namespace svx::sidebar;
void SwTextShell::ExecEnterNum(SfxRequest rReq)
{
@@ -54,43 +59,64 @@ void SwTextShell::ExecEnterNum(SfxReques
{
case FN_NUM_NUMBERING_ON:
{
-SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , sal_False );
-sal_Bool bMode = !GetShell().HasNumber(); // #i29560#
-if ( pItem )
-bMode = pItem-GetValue();
-else
-rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bMode ) );
-
-if ( bMode != (GetShell().HasNumber()) ) // #i29560#
-{
-rReq.Done();
-if( bMode )
-GetShell().NumOn();
-else
-GetShell().NumOrBulletOff(); // #i29560#
-}
+ GetShell().StartAllAction();
+ SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 ,
sal_False );
+ sal_Bool bMode = !GetShell().SelectionHasNumber(); // #i29560#
+ if ( pItem )
+ bMode = pItem-GetValue();
+ else
+ rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bMode ) );
+
+ if ( bMode != (GetShell().SelectionHasNumber()) ) // #i29560#
+ {
+ rReq.Done();
+ if( bMode )
+ GetShell().NumOn();
+ else
+ GetShell().NumOrBulletOff(); // #i29560#
+ }
+ sal_Bool bNewResult = GetShell().SelectionHasNumber();
+ if (bNewResult!=bMode) {
+ SfxBindings rBindings =
GetView().GetViewFrame()-GetBindings();
+ SfxBoolItem aItem(FN_NUM_NUMBERING_ON,!bNewResult);
+ rBindings.SetState(aItem);
+ SfxBoolItem aNewItem(FN_NUM_NUMBERING_ON,bNewResult);
+ rBindings.SetState(aNewItem);
+ }
+ GetShell().EndAllAction();
}
break;
case FN_NUM_BULLET_ON:
{
-SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 , sal_False );
-sal_Bool bMode = !GetShell().HasBullet(); // #i29560#
-if ( pItem )
-bMode = pItem-GetValue();
-else
-rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bMode ) );
-
-if ( bMode != (GetShell().HasBullet()) ) // #i29560#
-{
-rReq.Done();
-if( bMode )
-GetShell().BulletOn();
-else
-GetShell().NumOrBulletOff(); // #i29560#
-}
+ GetShell().StartAllAction();
+ SFX_REQUEST_ARG( rReq, pItem, SfxBoolItem, FN_PARAM_1 ,
sal_False );
+ sal_Bool bMode = !GetShell().SelectionHasBullet(); // #i29560#
+ if ( pItem )
+ bMode = pItem-GetValue();
+ else
+ rReq.AppendItem( SfxBoolItem( FN_PARAM_1, bMode ) );
+
+ if ( bMode != (GetShell().SelectionHasBullet()) ) // #i29560#
+ {
+ rReq.Done();
+ if( bMode )
+ GetShell().BulletOn();
+ else
+ GetShell().NumOrBulletOff(); // #i29560#
+ }
+ sal_Bool bNewResult = GetShell().SelectionHasBullet();
+ if (bNewResult!=bMode) {
+ SfxBindings rBindings =
GetView().GetViewFrame()-GetBindings();
+ SfxBoolItem aItem(FN_NUM_BULLET_ON,!bNewResult);
+ rBindings.SetState(aItem);
+ SfxBoolItem aNewItem(FN_NUM_BULLET_ON,bNewResult);
+ rBindings.SetState(aNewItem);
+ }
+ GetShell().EndAllAction();
}
break;
case FN_NUMBER_BULLETS:
+ case SID_OUTLINE_BULLET:
{
// -- OD 2008-02-29 #refactorlists#
//// per default sal_True, damit die Schleife im Dialog richtig
arbeitet!
@@ -244,4 +270,179 @@ void SwTextShell::ExecEnterNum(SfxReques
}
}
+void SwTextShell::ExecSetNumber(SfxRequest rReq)
+{
+ SwNumRule aRule( GetShell().GetUniqueNumRuleName(),
+// -- OD 2008-06-06 #i89178#
+
svn commit: r1470868 [40/40] - in /openoffice/branches/ia2: ./ ext_libraries/coinmp/ ext_libraries/serf/ ext_libraries/serf/win/ extras/l10n/source/fi/ main/ main/animations/source/animcore/ main/auto
Propchange:
openoffice/branches/ia2/test/testcommon/source/org/openoffice/test/vcl/
--
Merged
/openoffice/trunk/test/testcommon/source/org/openoffice/test/vcl:r1438339-1467894
Merged
/openoffice/branches/sidebar/test/testcommon/source/org/openoffice/test/vcl:r1415095-1466374
Modified: openoffice/branches/ia2/test/testuno/source/testlib/uno/SWUtil.java
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/test/testuno/source/testlib/uno/SWUtil.java?rev=1470868r1=1470867r2=1470868view=diff
==
--- openoffice/branches/ia2/test/testuno/source/testlib/uno/SWUtil.java
(original)
+++ openoffice/branches/ia2/test/testuno/source/testlib/uno/SWUtil.java Tue Apr
23 09:51:15 2013
@@ -29,8 +29,8 @@ import com.sun.star.beans.XPropertySet;
import com.sun.star.container.XNameAccess;
import com.sun.star.container.XNameContainer;
import com.sun.star.container.XNamed;
-import com.sun.star.document.XDocumentInfo;
-import com.sun.star.document.XDocumentInfoSupplier;
+import com.sun.star.document.XDocumentProperties;
+import com.sun.star.document.XDocumentPropertiesSupplier;
import com.sun.star.frame.XStorable;
import com.sun.star.io.IOException;
import com.sun.star.lang.XComponent;
@@ -119,18 +119,23 @@ public class SWUtil {
}
/**
-* Set document properties. such as subject, title etc
+* Set document properties. Only supported: subject, title, author
* @param document - set document information on this document
-* @param prop - document information, including Subject ,Title,
Author, Title, KeyWords
+* @param prop - document information, including Subject ,Title,
Author
* @param propValue - value you want to set for prop
* @throws Exception
*/
public static void setDocumentProperty(XTextDocument document, String
prop, String propValue) throws Exception {
- XDocumentInfoSupplier docInfoSupplier = (XDocumentInfoSupplier)
UnoRuntime.queryInterface(XDocumentInfoSupplier.class, document);
- XDocumentInfo docInfo = docInfoSupplier.getDocumentInfo();
- XPropertySet propsDocInfo =
(XPropertySet)UnoRuntime.queryInterface(XPropertySet.class, docInfo);
- propsDocInfo.setPropertyValue(prop, propValue);
- }
+ XDocumentPropertiesSupplier docPropsSupplier =
UnoRuntime.queryInterface(
+XDocumentPropertiesSupplier.class, document);
+ XDocumentProperties docProps = docPropsSupplier.getDocumentProperties();
+if ( prop.equals(Title))
+docProps.setTitle(propValue);
+else if ( prop.equals(Author))
+docProps.setAuthor(propValue);
+else if ( prop.equals(Subject))
+docProps.setSubject(propValue);
+}
/**
svn commit: r1463840 [1/6] - in /openoffice/branches/ia2/main: cui/source/customize/ cui/source/dialogs/ cui/source/inc/ cui/source/tabpages/ editeng/inc/editeng/ editeng/source/accessibility/ editeng
Author: steve_y Date: Wed Apr 3 07:04:20 2013 New Revision: 1463840 URL: http://svn.apache.org/r1463840 Log: IA2 migration for cui, editeng, svx Added: openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleSvxFindReplaceDialog.hxx openoffice/branches/ia2/main/svx/source/accessibility/AccessibleSvxFindReplaceDialog.cxx openoffice/branches/ia2/main/svx/source/accessibility/svxpixelctlaccessiblecontext.cxx Modified: openoffice/branches/ia2/main/cui/source/customize/cfg.cxx openoffice/branches/ia2/main/cui/source/customize/cfg.src openoffice/branches/ia2/main/cui/source/dialogs/cuigrfflt.cxx openoffice/branches/ia2/main/cui/source/dialogs/iconcdlg.cxx openoffice/branches/ia2/main/cui/source/inc/cuicharmap.hxx openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.cxx openoffice/branches/ia2/main/cui/source/tabpages/autocdlg.src openoffice/branches/ia2/main/cui/source/tabpages/connect.hrc openoffice/branches/ia2/main/cui/source/tabpages/tabarea.src openoffice/branches/ia2/main/cui/source/tabpages/tparea.cxx openoffice/branches/ia2/main/editeng/inc/editeng/AccessibleEditableTextPara.hxx openoffice/branches/ia2/main/editeng/inc/editeng/editdata.hxx openoffice/branches/ia2/main/editeng/inc/editeng/editeng.hxx openoffice/branches/ia2/main/editeng/inc/editeng/editview.hxx openoffice/branches/ia2/main/editeng/inc/editeng/splwrap.hxx openoffice/branches/ia2/main/editeng/inc/editeng/unoedhlp.hxx openoffice/branches/ia2/main/editeng/inc/editeng/unoedprx.hxx openoffice/branches/ia2/main/editeng/inc/editeng/unoedsrc.hxx openoffice/branches/ia2/main/editeng/inc/editeng/unofored.hxx openoffice/branches/ia2/main/editeng/inc/editeng/unoforou.hxx openoffice/branches/ia2/main/editeng/inc/editeng/unotext.hxx openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleEditableTextPara.cxx openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleHyperlink.cxx openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleParaManager.cxx openoffice/branches/ia2/main/editeng/source/accessibility/AccessibleStaticTextBase.cxx openoffice/branches/ia2/main/editeng/source/editeng/editdoc.hxx openoffice/branches/ia2/main/editeng/source/editeng/edtspell.cxx openoffice/branches/ia2/main/editeng/source/editeng/impedit.cxx openoffice/branches/ia2/main/editeng/source/editeng/impedit.hxx openoffice/branches/ia2/main/editeng/source/editeng/impedit2.cxx openoffice/branches/ia2/main/editeng/source/editeng/impedit3.cxx openoffice/branches/ia2/main/editeng/source/misc/splwrap.cxx openoffice/branches/ia2/main/editeng/source/outliner/outliner.cxx openoffice/branches/ia2/main/editeng/source/outliner/outlvw.cxx openoffice/branches/ia2/main/editeng/source/uno/unoedhlp.cxx openoffice/branches/ia2/main/editeng/source/uno/unoedprx.cxx openoffice/branches/ia2/main/editeng/source/uno/unofored.cxx openoffice/branches/ia2/main/editeng/source/uno/unoforou.cxx openoffice/branches/ia2/main/editeng/source/uno/unonrule.cxx openoffice/branches/ia2/main/editeng/source/uno/unotext.cxx openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/makefile.mk openoffice/branches/ia2/main/sfx2/inc/sfx2/viewsh.hxx openoffice/branches/ia2/main/starmath/source/accessibility.cxx openoffice/branches/ia2/main/starmath/source/accessibility.hxx openoffice/branches/ia2/main/svx/Library_svx.mk openoffice/branches/ia2/main/svx/inc/svx/AccessibleControlShape.hxx openoffice/branches/ia2/main/svx/inc/svx/AccessibleGraphicShape.hxx openoffice/branches/ia2/main/svx/inc/svx/AccessibleOLEShape.hxx openoffice/branches/ia2/main/svx/inc/svx/AccessibleShape.hxx openoffice/branches/ia2/main/svx/inc/svx/AccessibleTableShape.hxx openoffice/branches/ia2/main/svx/inc/svx/ChildrenManager.hxx openoffice/branches/ia2/main/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx openoffice/branches/ia2/main/svx/inc/svx/IAccessibleParent.hxx openoffice/branches/ia2/main/svx/inc/svx/ctredlin.hxx openoffice/branches/ia2/main/svx/inc/svx/dlgctrl.hxx openoffice/branches/ia2/main/svx/inc/svx/srchdlg.hxx openoffice/branches/ia2/main/svx/inc/svx/svdmodel.hxx openoffice/branches/ia2/main/svx/inc/svx/svdmrkv.hxx openoffice/branches/ia2/main/svx/inc/svx/svdoashp.hxx openoffice/branches/ia2/main/svx/inc/svx/svdobj.hxx openoffice/branches/ia2/main/svx/inc/svx/svdoole2.hxx openoffice/branches/ia2/main/svx/source/accessibility/AccessibleControlShape.cxx openoffice/branches/ia2/main/svx/source/accessibility/AccessibleEmptyEditSource.cxx openoffice/branches/ia2/main/svx/source/accessibility/AccessibleFrameSelector.cxx openoffice/branches/ia2/main/svx/source/accessibility/AccessibleGraphicShape.cxx openoffice/branches/ia2/main/svx/source/accessibility/AccessibleOLEShape.cxx openoffice/branches/ia2/main/svx
svn commit: r1463846 - /openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
Author: steve_y
Date: Wed Apr 3 07:29:26 2013
New Revision: 1463846
URL: http://svn.apache.org/r1463846
Log: (empty)
Added:
openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
Added:
openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl?rev=1463846view=auto
==
---
openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
(added)
+++
openoffice/branches/ia2/main/offapi/com/sun/star/accessibility/XAccessibleGetAccFlowTo.idl
Wed Apr 3 07:29:26 2013
@@ -0,0 +1,48 @@
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright IBM Corporation 2010.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3 License.
+ *
+ /
+
+#ifndef __com_sun_star_accessibility_XAccessibleGetAccFlowTo_idl_
+#define __com_sun_star_accessibility_XAccessibleGetAccFlowTo_idl_
+
+#ifndef __com_sun_star_uno_XInterface_idl__
+#include com/sun/star/uno/XInterface.idl
+#endif
+
+module com { module sun { module star { module accessibility {
+
+// !!!
+// MT: When integrating this, interface and method names should be renamed
somehow. Of course, file name also need to change then...
+// !!!
+interface XAccessibleGetAccFlowTo : ::com::sun::star::uno::XInterface
+{
+ sequenceany get_AccFlowTo([in] any aXShape, [in] long nType);
+};
+
+}; }; }; };
+
+#endif
svn commit: r1463864 - /openoffice/branches/ia2/main/editeng/source/editeng/editdoc.hxx
Author: steve_y Date: Wed Apr 3 07:58:26 2013 New Revision: 1463864 URL: http://svn.apache.org/r1463864 Log: (empty) Modified: openoffice/branches/ia2/main/editeng/source/editeng/editdoc.hxx Modified: openoffice/branches/ia2/main/editeng/source/editeng/editdoc.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/editeng/source/editeng/editdoc.hxx?rev=1463864r1=1463863r2=1463864view=diff == Files openoffice/branches/ia2/main/editeng/source/editeng/editdoc.hxx (original) and openoffice/branches/ia2/main/editeng/source/editeng/editdoc.hxx Wed Apr 3 07:58:26 2013 differ
svn commit: r1463876 - in /openoffice/branches/ia2/main/svx: inc/svx/AccessibleSvxFindReplaceDialog.hxx source/inc/svxpixelctlaccessiblecontext.hxx
Author: steve_y
Date: Wed Apr 3 08:32:36 2013
New Revision: 1463876
URL: http://svn.apache.org/r1463876
Log: (empty)
Added:
openoffice/branches/ia2/main/svx/inc/svx/AccessibleSvxFindReplaceDialog.hxx
openoffice/branches/ia2/main/svx/source/inc/svxpixelctlaccessiblecontext.hxx
Added:
openoffice/branches/ia2/main/svx/inc/svx/AccessibleSvxFindReplaceDialog.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/inc/svx/AccessibleSvxFindReplaceDialog.hxx?rev=1463876view=auto
==
--- openoffice/branches/ia2/main/svx/inc/svx/AccessibleSvxFindReplaceDialog.hxx
(added)
+++ openoffice/branches/ia2/main/svx/inc/svx/AccessibleSvxFindReplaceDialog.hxx
Wed Apr 3 08:32:36 2013
@@ -0,0 +1,66 @@
+/**
+ *
+ * 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
+ * regarding copyright ownership. The ASF licenses this file
+ * 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.
+ *
+ */
+
+
+#ifndef _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
+#define _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
+#ifndef _TOOLKIT_AWT_VCLXWINDOW_HXX_
+#include toolkit/awt/vclxwindow.hxx
+#endif
+#ifndef _TOOLKIT_AWT_VCLXACCESSIBLECOMPONENT_HXX_
+#include toolkit/awt/vclxaccessiblecomponent.hxx
+#endif
+
+#ifndef _TOOLKIT_AWT_VCLXWINDOWS_HXX_
+#include toolkit/awt/vclxwindows.hxx
+#endif
+
+
+class VCLXAccessibleSvxFindReplaceDialog : public VCLXAccessibleComponent
+{
+public:
+ VCLXAccessibleSvxFindReplaceDialog(VCLXWindow* pVCLXindow);
+ virtual ~VCLXAccessibleSvxFindReplaceDialog();
+ virtual void FillAccessibleRelationSet(
utl::AccessibleRelationSetHelper rRelationSet );
+ // XServiceInfo
+ virtual ::rtl::OUString SAL_CALL getImplementationName() throw
(::com::sun::star::uno::RuntimeException);
+ virtual ::com::sun::star::uno::Sequence ::rtl::OUString SAL_CALL
getSupportedServiceNames() throw (::com::sun::star::uno::RuntimeException);
+
+};
+
+
+class VCLXSvxFindReplaceDialog : public VCLXDialog
+{
+public:
+ VCLXSvxFindReplaceDialog(Window* pSplDlg)
+ {
+ SetWindow(pSplDlg);
+ }
+ virtual ~VCLXSvxFindReplaceDialog()
+ {};
+private:
+virtual ::com::sun::star::uno::Reference
+::com::sun::star::accessibility::XAccessibleContext
CreateAccessibleContext()
+ {
+ return new VCLXAccessibleSvxFindReplaceDialog(this);
+ }
+};
+#endif // _ACCESSIBLESVXFINDREPLACEDIALOG_HXX_
Added:
openoffice/branches/ia2/main/svx/source/inc/svxpixelctlaccessiblecontext.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/inc/svxpixelctlaccessiblecontext.hxx?rev=1463876view=auto
==
---
openoffice/branches/ia2/main/svx/source/inc/svxpixelctlaccessiblecontext.hxx
(added)
+++
openoffice/branches/ia2/main/svx/source/inc/svxpixelctlaccessiblecontext.hxx
Wed Apr 3 08:32:36 2013
@@ -0,0 +1,431 @@
+/*
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright IBM Corporation 2010.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * http://www.openoffice.org/license.html
+ * for a copy of the LGPLv3 License
svn commit: r1448553 - /openoffice/branches/ia2/main/vcl/source/window/window.cxx
Author: steve_y
Date: Thu Feb 21 08:54:49 2013
New Revision: 1448553
URL: http://svn.apache.org/r1448553
Log:
Fixed a build issue
Modified:
openoffice/branches/ia2/main/vcl/source/window/window.cxx
Modified: openoffice/branches/ia2/main/vcl/source/window/window.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/source/window/window.cxx?rev=1448553r1=1448552r2=1448553view=diff
==
--- openoffice/branches/ia2/main/vcl/source/window/window.cxx (original)
+++ openoffice/branches/ia2/main/vcl/source/window/window.cxx Thu Feb 21
08:54:49 2013
@@ -5393,7 +5393,7 @@ long Window::Notify( NotifyEvent rNEvt
}
// IAccessible2 implementation, 2009
-void Window::NotifyVCLEvent( ULONG nEvent ,void* pData /*= NULL*/)
+void Window::NotifyVCLEvent( sal_uLong nEvent ,void* pData /*= NULL*/)
{
ImplCallEventListeners( nEvent ,pData);
}
svn commit: r1441343 [6/35] - in /openoffice/branches/ia2: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n/
Modified: openoffice/branches/ia2/extras/l10n/source/gd/localize.sdf
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/extras/l10n/source/gd/localize.sdf?rev=1441343r1=1441342r2=1441343view=diff
==
--- openoffice/branches/ia2/extras/l10n/source/gd/localize.sdf (original)
+++ openoffice/branches/ia2/extras/l10n/source/gd/localize.sdf Fri Feb 1
08:46:00 2013
@@ -5102,7 +5102,7 @@ instsetoo_native inc_openoffice\windows\
instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf
0 LngText OOO_CONTROL_121 0 gd Suas
aon leibheil| 20120314 15:13:33
instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf
0 LngText OOO_CONTROL_122 0 gd Air
ais 20120314 15:13:33
instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf
0 LngText OOO_CONTROL_123 0 gd Sguir
dheth 20120314 15:13:33
-instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf
0 LngText OOO_CONTROL_124 0 gd Tha am
prògram seo stèidhichte air pròiseact Apache OpenOffice le taic buill
coimhearsnachd Apache. Airson nan creideisean, faic:
http://www.openoffice.org/welcome/credits.html
20120314 15:13:33
+instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf
0 LngText OOO_CONTROL_124 0 gd Tha am
prògram seo stèidhichte air pròiseact Apache OpenOffice (incubating) le
taic buill coimhearsnachd Apache. Airson nan creideisean, faic:
http://www.openoffice.org/welcome/credits.html
20120314 15:13:33
instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf
0 LngText OOO_CONTROL_125 0 gd Air
adhart20120314 15:13:33
instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf
0 LngText OOO_CONTROL_126 0 gd
{TahomaBold10}Fà ilte gun draoidh stà laidh aig [ProductName]
20120314 15:13:33
instsetoo_native inc_openoffice\windows\msi_languages\Control.ulf
0 LngText OOO_CONTROL_127 0 gd StÃ
laichidh an draoidh stà laidh [ProductName] air a' choimpiutair agad. Briog air
'Air adhart' gus leantainn air adhart. 20120314
15:13:33
@@ -5482,85 +5482,85 @@ instsetoo_nativeinc_openoffice\windows\
instsetoo_native inc_openoffice\windows\msi_languages\UIText.ulf 0
LngText OOO_UITEXT_47 0 gd Feum air
20120314 15:13:33
instsetoo_native inc_openoffice\windows\msi_languages\UIText.ulf 0
LngText OOO_UITEXT_48 0 gd Meud an diosga
20120314 15:13:33
instsetoo_native inc_openoffice\windows\msi_languages\UIText.ulf 0
LngText OOO_UITEXT_49 0 gd Clà r
20120314 15:13:33
-xmlsecuritysource\component\warnbox.src0 warningbox
RID_XMLSECWB_NO_MOZILLA_PROFILE 0 gd Digital
signatures functionality could not be used, because no Mozilla user profile was
found. Please check the Mozilla installation.
20120314 15:13:33
-xmlsecuritysource\dialogs\certificatechooser.src 0 fixedtext
RID_XMLSECDLG_CERTCHOOSER FT_HINT_SELECT 0 gd
Select the certificate you want to use for signing
20120314 15:13:33
-xmlsecuritysource\dialogs\certificatechooser.src 0 string
RID_XMLSECDLG_CERTCHOOSER STR_HEADERBAR 0 gd
Issued to\tIssued by\tExpiration date 20120314
15:13:33
-xmlsecuritysource\dialogs\certificatechooser.src 0 pushbutton
RID_XMLSECDLG_CERTCHOOSER BTN_VIEWCERT0 gd
View Certificate... 20120314 15:13:33
-xmlsecuritysource\dialogs\certificatechooser.src 0 modaldialog
RID_XMLSECDLG_CERTCHOOSER HID_XMLSEC_DLG_CERTCHOOSER
0 gd Select Certificate 20120314
15:13:33
-xmlsecuritysource\dialogs\certificateviewer.src0 pageitem
RID_XMLSECDLG_CERTVIEWER.1 RID_XMLSECTP_GENERAL0
gd General 20120314 15:13:33
-xmlsecuritysource\dialogs\certificateviewer.src0 pageitem
svn commit: r1441343 [29/35] - in /openoffice/branches/ia2: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n
Modified:
openoffice/branches/ia2/main/sysui/desktop/mandriva/mandriva-menus.spec
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/mandriva/mandriva-menus.spec?rev=1441343r1=1441342r2=1441343view=diff
==
--- openoffice/branches/ia2/main/sysui/desktop/mandriva/mandriva-menus.spec
(original)
+++ openoffice/branches/ia2/main/sysui/desktop/mandriva/mandriva-menus.spec Fri
Feb 1 08:46:00 2013
@@ -33,7 +33,7 @@ BuildArch: noarch
#here and check for the 'mandriva-release' in the future (next year).
#
Requires: mandrake-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
Modified: openoffice/branches/ia2/main/sysui/desktop/productversion.mk
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/productversion.mk?rev=1441343r1=1441342r2=1441343view=diff
==
--- openoffice/branches/ia2/main/sysui/desktop/productversion.mk (original)
+++ openoffice/branches/ia2/main/sysui/desktop/productversion.mk Fri Feb 1
08:46:00 2013
@@ -40,8 +40,9 @@ PKGDIR=$(BIN)
.ENDIF
# CAUTION! here the parsing result from openoffice.lst is NOT available, so
this is hardcoded
-# but should not be. When replacing with $(UNIXBASISROOTNAME) it will be empty
(!)
-PRODUCTLIST = openoffice.org
+# but should not be.
+# It has to be equal to PRODUCTNAME:l:s/\s/\_/g - see
solenv/bin/modules/installer/setupscript.pm
+PRODUCTLIST = apache_openoffice
# default values to minimize maintainance effort
@@ -65,11 +66,11 @@ ICONVERSION = $(PRODUCTVERSIONSHORT:s/./
UNIXWRAPPERNAME *= '$${{UNIXPRODUCTNAME}}$${{BRANDPACKAGEVERSION}}'
# CAUTION! $(UNIXBASISROOTNAME) from openoffice.lst NOT available (!)
-PRODUCTNAME.openoffice.org = OpenOffice.org
+PRODUCTNAME.apache_openoffice = Apache OpenOffice
-PRODUCTVERSION.openoffice.org = $(PRODUCTVERSION)
-PRODUCTVERSIONSHORT.openoffice.org = $(PRODUCTVERSIONSHORT)
-PKGVERSION.openoffice.org = $(PKGVERSION)
-UNIXFILENAME.openoffice.org =
$(PRODUCTNAME.openoffice.org:l)$(PRODUCTVERSIONSHORT.openoffice.org)
-ICONPREFIX.openoffice.org = $(UNIXFILENAME.openoffice.org:s/.//g)
+PRODUCTVERSION.apache_openoffice = $(PRODUCTVERSION)
+PRODUCTVERSIONSHORT.apache_openoffice = $(PRODUCTVERSIONSHORT)
+PKGVERSION.apache_openoffice = $(PKGVERSION)
+UNIXFILENAME.apache_openoffice = $(PRODUCTNAME.apache_openoffice:l:s/
/_/g)$(PRODUCTVERSIONSHORT.apache_openoffice)
+ICONPREFIX.apache_openoffice = $(UNIXFILENAME.apache_openoffice:s/.//g)
Modified: openoffice/branches/ia2/main/sysui/desktop/redhat/redhat-menus.spec
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/redhat/redhat-menus.spec?rev=1441343r1=1441342r2=1441343view=diff
==
--- openoffice/branches/ia2/main/sysui/desktop/redhat/redhat-menus.spec
(original)
+++ openoffice/branches/ia2/main/sysui/desktop/redhat/redhat-menus.spec Fri Feb
1 08:46:00 2013
@@ -29,7 +29,7 @@ Vendor: Apache Software Foundation
AutoReqProv: no
BuildArch: noarch
Requires: redhat-release
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
%define _unpackaged_files_terminate_build 0
%define _binary_filedigest_algorithm 1
%define _binary_payload w9.gzdio
Modified: openoffice/branches/ia2/main/sysui/desktop/share/brand.pl
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/share/brand.pl?rev=1441343r1=1441342r2=1441343view=diff
==
--- openoffice/branches/ia2/main/sysui/desktop/share/brand.pl (original)
+++ openoffice/branches/ia2/main/sysui/desktop/share/brand.pl Fri Feb 1
08:46:00 2013
@@ -34,8 +34,8 @@ eval 'exec perl -wS $0 ${1+$@}'
$destdir = pop @ARGV;
mkdir $destdir,0777;
-$productname = OpenOffice.org;
-$productfilename = openoffice;
+$productname = Apache OpenOffice;
+$productfilename = apacheopenoffice;
$prefix = ;
$iconprefix = ;
Modified: openoffice/branches/ia2/main/sysui/desktop/share/create_mime_xml.pl
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/share/create_mime_xml.pl?rev=1441343r1=1441342r2=1441343view=diff
==
--- openoffice/branches/ia2/main/sysui/desktop/share/create_mime_xml.pl
(original)
+++ openoffice/branches/ia2/main/sysui/desktop/share/create_mime_xml.pl Fri Feb
1 08:46:00 2013
@@ -21,7 +21,7 @@
# *
use File::Basename;
$basedir = dirname($0);
-$productname = 'OpenOffice.org';
+$productname = 'Apache OpenOffice';
$mimedir = $basedir.'/../mimetypes';
$FS= ' ';
svn commit: r1429484 - in /openoffice/branches/ia2/main/toolkit: inc/toolkit/awt/vclxwindows.hxx source/awt/vclxaccessiblecomponent.cxx source/awt/vclxtoolkit.cxx source/awt/vclxwindows.cxx
Author: steve_y
Date: Sun Jan 6 09:36:31 2013
New Revision: 1429484
URL: http://svn.apache.org/viewvc?rev=1429484view=rev
Log:
IA2 migration for toolkit module
Modified:
openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxwindows.hxx
openoffice/branches/ia2/main/toolkit/source/awt/vclxaccessiblecomponent.cxx
openoffice/branches/ia2/main/toolkit/source/awt/vclxtoolkit.cxx
openoffice/branches/ia2/main/toolkit/source/awt/vclxwindows.cxx
Modified: openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxwindows.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxwindows.hxx?rev=1429484r1=1429483r2=1429484view=diff
==
--- openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxwindows.hxx
(original)
+++ openoffice/branches/ia2/main/toolkit/inc/toolkit/awt/vclxwindows.hxx Sun
Jan 6 09:36:31 2013
@@ -876,6 +876,10 @@ public:
class TOOLKIT_DLLPUBLIC VCLXDateField :public
::com::sun::star::awt::XDateField,
public VCLXFormattedSpinField
{
+//IAccessibility2 Impplementaton 2009-
+protected:
+ virtual ::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessibleContext CreateAccessibleContext();
+//-IAccessibility2 Impplementaton 2009
public:
VCLXDateField();
~VCLXDateField();
@@ -922,6 +926,10 @@ public:
class VCLXTimeField : public ::com::sun::star::awt::XTimeField,
public VCLXFormattedSpinField
{
+//IAccessibility2 Impplementaton 2009-
+protected:
+ virtual ::com::sun::star::uno::Reference
::com::sun::star::accessibility::XAccessibleContext CreateAccessibleContext();
+//-IAccessibility2 Impplementaton 2009
public:
VCLXTimeField();
~VCLXTimeField();
Modified:
openoffice/branches/ia2/main/toolkit/source/awt/vclxaccessiblecomponent.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/toolkit/source/awt/vclxaccessiblecomponent.cxx?rev=1429484r1=1429483r2=1429484view=diff
==
--- openoffice/branches/ia2/main/toolkit/source/awt/vclxaccessiblecomponent.cxx
(original)
+++ openoffice/branches/ia2/main/toolkit/source/awt/vclxaccessiblecomponent.cxx
Sun Jan 6 09:36:31 2013
@@ -37,6 +37,10 @@
#include toolkit/awt/vclxfont.hxx
#include vcl/dialog.hxx
#include vcl/window.hxx
+//IAccessibility2 Implementation 2009-
+//Solution:Need methods in Edit.
+#include vcl/edit.hxx
+//-IAccessibility2 Implementation 2009
#include tools/debug.hxx
#include unotools/accessiblestatesethelper.hxx
#include unotools/accessiblerelationsethelper.hxx
@@ -441,7 +445,9 @@ void VCLXAccessibleComponent::FillAccess
Window* pWindow = GetWindow();
if ( pWindow )
{
+//IAccessibility2 Implementation 2009-
Window *pLabeledBy = pWindow-GetAccessibleRelationLabeledBy();
+//-IAccessibility2 Implementation 2009
if ( pLabeledBy pLabeledBy != pWindow )
{
uno::Sequence uno::Reference uno::XInterface
aSequence(1);
@@ -456,6 +462,20 @@ void VCLXAccessibleComponent::FillAccess
aSequence[0] = pLabelFor-GetAccessible();
rRelationSet.AddRelation(
accessibility::AccessibleRelation(
accessibility::AccessibleRelationType::LABEL_FOR, aSequence ) );
}
+//IAccessibility2 Implementation 2009-
+ Window* pMemberOf = pWindow-GetAccessibleRelationMemberOf();
+ if ( pMemberOf pMemberOf != pWindow )
+ {
+ uno::Sequence uno::Reference uno::XInterface
aSequence(1);
+ aSequence[0] = pMemberOf-GetAccessible();
+ rRelationSet.AddRelation(
accessibility::AccessibleRelation(
accessibility::AccessibleRelationType::MEMBER_OF, aSequence ) );
+ }
+ uno::Sequence uno::Reference uno::XInterface
aFlowToSequence = pWindow-GetAccFlowToSequence();
+ if( aFlowToSequence.getLength() 0 )
+ {
+ rRelationSet.AddRelation(
accessibility::AccessibleRelation(
accessibility::AccessibleRelationType::CONTENT_FLOWS_TO, aFlowToSequence ) );
+ }
+//-IAccessibility2 Implementation 2009
}
}
@@ -504,13 +524,50 @@ void VCLXAccessibleComponent::FillAccess
if ( pWindow-GetStyle() WB_SIZEABLE )
rStateSet.AddState(
accessibility::AccessibleStateType::RESIZABLE );
-
+//IAccessibility2 Implementation 2009-
+ // 6. frame doesn't have MOVABLE state
+ // 10. for password
svn commit: r1429675 - in /openoffice/branches/ia2/main/svtools: inc/svtools/ivctrl.hxx source/contnr/ivctrl.cxx
Author: steve_y
Date: Mon Jan 7 06:04:58 2013
New Revision: 1429675
URL: http://svn.apache.org/viewvc?rev=1429675view=rev
Log:
Resolved dependency for accessibility module
Modified:
openoffice/branches/ia2/main/svtools/inc/svtools/ivctrl.hxx
openoffice/branches/ia2/main/svtools/source/contnr/ivctrl.cxx
Modified: openoffice/branches/ia2/main/svtools/inc/svtools/ivctrl.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/inc/svtools/ivctrl.hxx?rev=1429675r1=1429674r2=1429675view=diff
==
--- openoffice/branches/ia2/main/svtools/inc/svtools/ivctrl.hxx (original)
+++ openoffice/branches/ia2/main/svtools/inc/svtools/ivctrl.hxx Mon Jan 7
06:04:58 2013
@@ -272,6 +272,9 @@ protected:
voidCallImplEventListeners(sal_uLong
nEvent, void* pData);
public:
+//IAccessibility2 Implementation 2009-
+ sal_BoolbCanBeFocused;
+//-IAccessibility2 Implementation 2009
SvtIconChoiceCtrl( Window*
pParent, WinBits nWinStyle = WB_ICON | WB_BORDER );
SvtIconChoiceCtrl( Window*
pParent, const ResId rResId );
Modified: openoffice/branches/ia2/main/svtools/source/contnr/ivctrl.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svtools/source/contnr/ivctrl.cxx?rev=1429675r1=1429674r2=1429675view=diff
==
--- openoffice/branches/ia2/main/svtools/source/contnr/ivctrl.cxx (original)
+++ openoffice/branches/ia2/main/svtools/source/contnr/ivctrl.cxx Mon Jan 7
06:04:58 2013
@@ -133,6 +133,9 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Wi
_pImp-SetGrid( Size( 100, 70 ) );
_pImp-InitSettings();
_pImp-SetPositionMode( IcnViewPositionModeAutoArrange );
+//IAccessibility2 Implementation 2009-
+ bCanBeFocused = sal_True;
+//-IAccessibility2 Implementation 2009
}
SvtIconChoiceCtrl::SvtIconChoiceCtrl( Window* pParent, const ResId rResId ) :
@@ -148,6 +151,9 @@ SvtIconChoiceCtrl::SvtIconChoiceCtrl( Wi
_pImp-SetGrid( Size( 100, 70 ) );
_pImp-InitSettings();
_pImp-SetPositionMode( IcnViewPositionModeAutoArrange );
+//IAccessibility2 Implementation 2009-
+ bCanBeFocused = sal_True;
+//-IAccessibility2 Implementation 2009
}
SvtIconChoiceCtrl::~SvtIconChoiceCtrl()
@@ -306,6 +312,13 @@ void SvtIconChoiceCtrl::VisibleRectChang
void SvtIconChoiceCtrl::GetFocus()
{
+//IAccessibility2 Implementation 2009-
+ if( !bCanBeFocused )
+ {
+ bCanBeFocused = sal_True;
+ return;
+ }
+//-IAccessibility2 Implementation 2009
_pImp-GetFocus();
Control::GetFocus();
sal_uLong nPos;
svn commit: r1429204 - in /openoffice/branches/ia2/main/vcl: inc/ inc/vcl/ source/control/ source/window/
Author: steve_y
Date: Sat Jan 5 06:11:12 2013
New Revision: 1429204
URL: http://svn.apache.org/viewvc?rev=1429204view=rev
Log:
IA2 migration for vcl module
Modified:
openoffice/branches/ia2/main/vcl/inc/ilstbox.hxx
openoffice/branches/ia2/main/vcl/inc/vcl/combobox.hxx
openoffice/branches/ia2/main/vcl/inc/vcl/lstbox.hxx
openoffice/branches/ia2/main/vcl/inc/vcl/menu.hxx
openoffice/branches/ia2/main/vcl/inc/vcl/svapp.hxx
openoffice/branches/ia2/main/vcl/inc/vcl/vclevent.hxx
openoffice/branches/ia2/main/vcl/inc/vcl/window.hxx
openoffice/branches/ia2/main/vcl/source/control/combobox.cxx
openoffice/branches/ia2/main/vcl/source/control/edit.cxx
openoffice/branches/ia2/main/vcl/source/control/ilstbox.cxx
openoffice/branches/ia2/main/vcl/source/control/lstbox.cxx
openoffice/branches/ia2/main/vcl/source/control/morebtn.cxx
openoffice/branches/ia2/main/vcl/source/control/tabctrl.cxx
openoffice/branches/ia2/main/vcl/source/window/btndlg.cxx
openoffice/branches/ia2/main/vcl/source/window/dlgctrl.cxx
openoffice/branches/ia2/main/vcl/source/window/menu.cxx
openoffice/branches/ia2/main/vcl/source/window/toolbox.cxx
openoffice/branches/ia2/main/vcl/source/window/toolbox2.cxx
openoffice/branches/ia2/main/vcl/source/window/window.cxx
Modified: openoffice/branches/ia2/main/vcl/inc/ilstbox.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/ia2/main/vcl/inc/ilstbox.hxx?rev=1429204r1=1429203r2=1429204view=diff
==
--- openoffice/branches/ia2/main/vcl/inc/ilstbox.hxx (original)
+++ openoffice/branches/ia2/main/vcl/inc/ilstbox.hxx Sat Jan 5 06:11:12 2013
@@ -248,6 +248,10 @@ private:
LinkmaDoubleClickHdl;
LinkmaUserDrawHdl;
LinkmaMRUChangedHdl;
+//IAccessibility2 Implementation 2009-
+ LinkmaFocusHdl;
+ LinkmaListItemSelectHdl;
+//-IAccessibility2 Implementation 2009
::vcl::QuickSelectionEngine
maQuickSelectionEngine;
@@ -262,7 +266,10 @@ protected:
virtual voidGetFocus();
virtual voidLoseFocus();
- sal_BoolSelectEntries( sal_uInt16 nSelect,
LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False );
+ //IAccessibility2 Implementation 2009-
+ //sal_Bool SelectEntries( sal_uInt16 nSelect,
LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False );
+ sal_BoolSelectEntries( sal_uInt16 nSelect,
LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False,
sal_Bool bSelectPosChange = sal_False );
+ //-IAccessibility2 Implementation 2009
voidImplPaint( sal_uInt16 nPos, sal_Bool bErase =
sal_False, bool bLayout = false );
void ImplDoPaint( const Rectangle rRect, bool
bLayout = false );
voidImplCalcMetrics();
@@ -359,7 +366,13 @@ public:
const Link GetUserDrawHdl() const {
return maUserDrawHdl; }
voidSetMRUChangedHdl( const Link rLink ) {
maMRUChangedHdl = rLink; }
const Link GetMRUChangedHdl() const
{ return maMRUChangedHdl; }
-
+//IAccessibility2 Implementation 2009-
+ voidSetFocusHdl( const Link rLink ){
maFocusHdl = rLink ; }
+ const Link GetFocusHdl() const {
return maFocusHdl; }
+
+ voidSetListItemSelectHdl( const Link rLink )
{ maListItemSelectHdl = rLink ; }
+ const Link GetListItemSelectHdl() const
{ return maListItemSelectHdl; }
+//-IAccessibility2 Implementation 2009
sal_BoolIsSelectionChanged() const { return
mbSelectionChanged; }
sal_uInt16 GetSelectModifier() const { return
mnSelectModifier; }
@@ -489,6 +502,12 @@ public:
voidSetUserDrawHdl( const Link rLink ) {
maLBWindow.SetUserDrawHdl( rLink ); }
const Link GetUserDrawHdl() const {
return maLBWindow.GetUserDrawHdl(); }
+//IAccessibility2 Implementation 2009-
+ voidSetFocusHdl( const Link rLink ){
maLBWindow.SetFocusHdl( rLink ); }
+ const Link GetFocusHdl() const {
return maLBWindow.GetFocusHdl(); }
+ voidSetListItemSelectHdl( const Link rLink )
{ maLBWindow.SetListItemSelectHdl( rLink ); }
+ const Link GetListItemSelectHdl() const{ return
maLBWindow.GetListItemSelectHdl(); }
+//-IAccessibility2 Implementation 2009
void
svn commit: r1417739 - /openoffice/branches/ia2/
Author: steve_y Date: Thu Dec 6 05:34:14 2012 New Revision: 1417739 URL: http://svn.apache.org/viewvc?rev=1417739view=rev Log: (empty) Added: openoffice/branches/ia2/ (props changed) - copied from r1417535, openoffice/trunk/ Propchange: openoffice/branches/ia2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Dec 6 05:34:14 2012 @@ -0,0 +1,4 @@ +/incubator/ooo/branches/AOO34:1346776-1346777,1347535,1348052,1350569,1352456,1369110,1371068 +/incubator/ooo/branches/alg/linecap:1226811-1232461 +/incubator/ooo/branches/alg/svgreplacement:1205420-1220782 +/incubator/ooo/branches/writer001:1356067-1386577
