You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2014/01/03 15:45:04 UTC
svn commit: r1555112 [16/18] - in /openoffice/branches/rejuvenate01: ./
main/ main/autodoc/source/parser_i/idoc/ main/dbaccess/source/shared/
main/helpcontent2/source/text/shared/01/
main/offapi/com/sun/star/accessibility/ main/offapi/com/sun/star/anim...
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/fldui/fldmgr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/fldui/fldmgr.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/fldui/fldmgr.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/fldui/fldmgr.cxx Fri Jan 3 14:44:44 2014
@@ -854,12 +854,13 @@ sal_uInt16 SwFldMgr::GetCurTypeId() cons
--------------------------------------------------------------------*/
-sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData )
+sal_Bool SwFldMgr::InsertFld(
+ const SwInsertFld_Data& rData )
{
SwField* pFld = 0;
- sal_Bool bExp = sal_False;
- sal_Bool bTbl = sal_False;
- sal_Bool bPageVar = sal_False;
+ sal_Bool bExp = sal_False;
+ sal_Bool bTbl = sal_False;
+ sal_Bool bPageVar = sal_False;
sal_uLong nFormatId = rData.nFormatId;
sal_uInt16 nSubType = rData.nSubType;
sal_Unicode cSeparator = rData.cSeparator;
@@ -871,238 +872,269 @@ sal_Bool SwFldMgr::InsertFld( const SwI
return sal_False;
switch(rData.nTypeId)
- { // ACHTUNG dieses Feld wird ueber einen gesonderten Dialog eingefuegt
- case TYP_POSTITFLD:
- {
- SwPostItFieldType* pType = (SwPostItFieldType*)pCurShell->GetFldType(0, RES_POSTITFLD);
- pFld = new SwPostItField(pType, rData.sPar1, rData.sPar2, DateTime());
- break;
- }
- case TYP_SCRIPTFLD:
- {
- SwScriptFieldType* pType =
+ {
+ case TYP_POSTITFLD:
+ {
+ SwPostItFieldType* pType = (SwPostItFieldType*)pCurShell->GetFldType(0, RES_POSTITFLD);
+ SwPostItField* pPostItField =
+ new SwPostItField(
+ pType,
+ rData.sPar2, // content
+ rData.sPar1, // author
+ aEmptyStr, // author's initials
+ aEmptyStr, // name
+ DateTime() );
+ pFld = pPostItField;
+ }
+ break;
+
+ case TYP_SCRIPTFLD:
+ {
+ SwScriptFieldType* pType =
(SwScriptFieldType*)pCurShell->GetFldType(0, RES_SCRIPTFLD);
pFld = new SwScriptField(pType, rData.sPar1, rData.sPar2, (sal_Bool)nFormatId);
- break;
- }
- case TYP_COMBINED_CHARS:
- {
- SwCombinedCharFieldType* pType = (SwCombinedCharFieldType*)
- pCurShell->GetFldType( 0, RES_COMBINED_CHARS );
+ break;
+ }
+
+ case TYP_COMBINED_CHARS:
+ {
+ SwCombinedCharFieldType* pType = (SwCombinedCharFieldType*)
+ pCurShell->GetFldType( 0, RES_COMBINED_CHARS );
pFld = new SwCombinedCharField( pType, rData.sPar1 );
- }
- break;
- case TYP_AUTHORITY:
- {
- SwAuthorityFieldType* pType =
+ }
+ break;
+
+ case TYP_AUTHORITY:
+ {
+ SwAuthorityFieldType* pType =
(SwAuthorityFieldType*)pCurShell->GetFldType(0, RES_AUTHORITY);
- if(!pType)
- {
- pType =
+ if(!pType)
+ {
+ pType =
(SwAuthorityFieldType*)pCurShell->InsertFldType(
- SwAuthorityFieldType(pCurShell->GetDoc()));
- }
+ SwAuthorityFieldType(pCurShell->GetDoc()));
+ }
pFld = new SwAuthorityField(pType, rData.sPar1);
- }
- break;
- case TYP_DATEFLD:
- case TYP_TIMEFLD:
- {
+ }
+ break;
+
+ case TYP_DATEFLD:
+ case TYP_TIMEFLD:
+ {
sal_uInt16 nSub = static_cast< sal_uInt16 >(rData.nTypeId == TYP_DATEFLD ? DATEFLD : TIMEFLD);
nSub |= nSubType == DATE_VAR ? 0 : FIXEDFLD;
- SwDateTimeFieldType* pTyp =
+ SwDateTimeFieldType* pTyp =
(SwDateTimeFieldType*)pCurShell->GetFldType(0, RES_DATETIMEFLD);
pFld = new SwDateTimeField(pTyp, nSub, nFormatId);
pFld->SetPar2(rData.sPar2);
- break;
- }
- case TYP_FILENAMEFLD:
- {
- SwFileNameFieldType* pTyp =
+ break;
+ }
+
+ case TYP_FILENAMEFLD:
+ {
+ SwFileNameFieldType* pTyp =
(SwFileNameFieldType*)pCurShell->GetFldType(0, RES_FILENAMEFLD);
pFld = new SwFileNameField(pTyp, nFormatId);
- break;
- }
- case TYP_TEMPLNAMEFLD:
- {
- SwTemplNameFieldType* pTyp =
+ break;
+ }
+
+ case TYP_TEMPLNAMEFLD:
+ {
+ SwTemplNameFieldType* pTyp =
(SwTemplNameFieldType*)pCurShell->GetFldType(0, RES_TEMPLNAMEFLD);
pFld = new SwTemplNameField(pTyp, nFormatId);
- break;
- }
- case TYP_CHAPTERFLD:
+ break;
+ }
+
+ case TYP_CHAPTERFLD:
{
sal_uInt16 nByte = (sal_uInt16)rData.sPar2.ToInt32();
- SwChapterFieldType* pTyp =
+ SwChapterFieldType* pTyp =
(SwChapterFieldType*)pCurShell->GetFldType(0, RES_CHAPTERFLD);
pFld = new SwChapterField(pTyp, nFormatId);
- nByte = Max(sal_uInt16(1), nByte);
- nByte = Min(nByte, sal_uInt16(MAXLEVEL));
- nByte -= 1;
- ((SwChapterField*)pFld)->SetLevel((sal_uInt8)nByte);
- break;
- }
- case TYP_NEXTPAGEFLD:
- case TYP_PREVPAGEFLD:
- case TYP_PAGENUMBERFLD:
- {
+ nByte = Max(sal_uInt16(1), nByte);
+ nByte = Min(nByte, sal_uInt16(MAXLEVEL));
+ nByte -= 1;
+ ((SwChapterField*)pFld)->SetLevel((sal_uInt8)nByte);
+ break;
+ }
+
+ case TYP_NEXTPAGEFLD:
+ case TYP_PREVPAGEFLD:
+ case TYP_PAGENUMBERFLD:
+ {
short nOff = (short)rData.sPar2.ToInt32();
if(rData.nTypeId == TYP_NEXTPAGEFLD)
- {
+ {
if( SVX_NUM_CHAR_SPECIAL == nFormatId )
- nOff = 1;
- else
- nOff += 1;
+ nOff = 1;
+ else
+ nOff += 1;
nSubType = PG_NEXT;
- }
+ }
else if(rData.nTypeId == TYP_PREVPAGEFLD)
- {
+ {
if( SVX_NUM_CHAR_SPECIAL == nFormatId )
- nOff = -1;
- else
- nOff -= 1;
+ nOff = -1;
+ else
+ nOff -= 1;
nSubType = PG_PREV;
- }
- else
+ }
+ else
nSubType = PG_RANDOM;
- SwPageNumberFieldType* pTyp =
+ SwPageNumberFieldType* pTyp =
(SwPageNumberFieldType*)pCurShell->GetFldType(0, RES_PAGENUMBERFLD);
pFld = new SwPageNumberField(pTyp, nSubType, nFormatId, nOff);
if( SVX_NUM_CHAR_SPECIAL == nFormatId &&
( PG_PREV == nSubType || PG_NEXT == nSubType ) )
((SwPageNumberField*)pFld)->SetUserString( rData.sPar2 );
- break;
- }
- case TYP_DOCSTATFLD:
- { SwDocStatFieldType* pTyp =
+ break;
+ }
+
+ case TYP_DOCSTATFLD:
+ {
+ SwDocStatFieldType* pTyp =
(SwDocStatFieldType*)pCurShell->GetFldType(0, RES_DOCSTATFLD);
pFld = new SwDocStatField(pTyp, nSubType, nFormatId);
- break;
- }
- case TYP_AUTHORFLD:
- { SwAuthorFieldType* pTyp =
+ break;
+ }
+
+ case TYP_AUTHORFLD:
+ {
+ SwAuthorFieldType* pTyp =
(SwAuthorFieldType*)pCurShell->GetFldType(0, RES_AUTHORFLD);
pFld = new SwAuthorField(pTyp, nFormatId);
- break;
- }
- case TYP_CONDTXTFLD:
- case TYP_HIDDENTXTFLD:
- {
- SwHiddenTxtFieldType* pTyp =
+ break;
+ }
+
+ case TYP_CONDTXTFLD:
+ case TYP_HIDDENTXTFLD:
+ {
+ SwHiddenTxtFieldType* pTyp =
(SwHiddenTxtFieldType*)pCurShell->GetFldType(0, RES_HIDDENTXTFLD);
pFld = new SwHiddenTxtField(pTyp, sal_True, rData.sPar1, rData.sPar2, sal_False, rData.nTypeId);
- bExp = sal_True;
- break;
- }
- case TYP_HIDDENPARAFLD:
- {
- SwHiddenParaFieldType* pTyp =
+ bExp = sal_True;
+ break;
+ }
+
+ case TYP_HIDDENPARAFLD:
+ {
+ SwHiddenParaFieldType* pTyp =
(SwHiddenParaFieldType*)pCurShell->GetFldType(0, RES_HIDDENPARAFLD);
pFld = new SwHiddenParaField(pTyp, rData.sPar1);
- bExp = sal_True;
- break;
- }
- case TYP_SETREFFLD:
- {
+ bExp = sal_True;
+ break;
+ }
+
+ case TYP_SETREFFLD:
+ {
if( rData.sPar1.Len() > 0 && CanInsertRefMark( rData.sPar1 ) )
- {
+ {
pCurShell->SetAttrItem( SwFmtRefMark( rData.sPar1 ) );
- return sal_True;
- }
- return sal_False;
- }
- case TYP_GETREFFLD:
- {
- SwGetRefFieldType* pTyp =
+ return sal_True;
+ }
+ return sal_False;
+ }
+
+ case TYP_GETREFFLD:
+ {
+ SwGetRefFieldType* pTyp =
(SwGetRefFieldType*)pCurShell->GetFldType(0, RES_GETREFFLD);
sal_uInt16 nSeqNo = (sal_uInt16)rData.sPar2.ToInt32();
pFld = new SwGetRefField(pTyp, rData.sPar1, nSubType, nSeqNo, nFormatId);
- bExp = sal_True;
- break;
- }
- case TYP_DDEFLD:
- {
- //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
- // Namen haben! Wird hier noch nicht beachtet.
+ bExp = sal_True;
+ break;
+ }
+
+ case TYP_DDEFLD:
+ {
+ //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren
+ // Namen haben! Wird hier noch nicht beachtet.
String sCmd( rData.sPar2 );
sal_uInt16 nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator );
sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos );
SwDDEFieldType aType( rData.sPar1, sCmd, (sal_uInt16) nFormatId );
SwDDEFieldType* pTyp = (SwDDEFieldType*) pCurShell->InsertFldType( aType );
- pFld = new SwDDEField( pTyp );
- break;
- }
- case TYP_MACROFLD:
- {
- SwMacroFieldType* pTyp =
- (SwMacroFieldType*)pCurShell->GetFldType(0, RES_MACROFLD);
+ pFld = new SwDDEField( pTyp );
+ break;
+ }
- pFld = new SwMacroField(pTyp, rData.sPar1, rData.sPar2);
+ case TYP_MACROFLD:
+ {
+ SwMacroFieldType* pTyp =
+ (SwMacroFieldType*)pCurShell->GetFldType(0, RES_MACROFLD);
- break;
- }
- case TYP_INTERNETFLD:
- {
+ pFld = new SwMacroField(pTyp, rData.sPar1, rData.sPar2);
+
+ break;
+ }
+
+ case TYP_INTERNETFLD:
+ {
SwFmtINetFmt aFmt( rData.sPar1, sCurFrame );
- if( pMacroItem )
- aFmt.SetMacroTbl( &pMacroItem->GetMacroTable() );
+ if( pMacroItem )
+ aFmt.SetMacroTbl( &pMacroItem->GetMacroTable() );
return pCurShell->InsertURL( aFmt, rData.sPar2 );
- }
- case TYP_JUMPEDITFLD:
- {
- SwJumpEditFieldType* pTyp =
+ }
+
+ case TYP_JUMPEDITFLD:
+ {
+ SwJumpEditFieldType* pTyp =
(SwJumpEditFieldType*)pCurShell->GetFldType(0, RES_JUMPEDITFLD);
pFld = new SwJumpEditField(pTyp, nFormatId, rData.sPar1, rData.sPar2 );
- break;
- }
- case TYP_DOCINFOFLD:
- {
+ break;
+ }
+
+ case TYP_DOCINFOFLD:
+ {
SwDocInfoFieldType* pTyp = (SwDocInfoFieldType*)pCurShell->GetFldType(
- 0, RES_DOCINFOFLD );
+ 0, RES_DOCINFOFLD );
pFld = new SwDocInfoField(pTyp, nSubType, rData.sPar1, nFormatId);
- break;
- }
- case TYP_EXTUSERFLD:
- {
+ break;
+ }
+
+ case TYP_EXTUSERFLD:
+ {
SwExtUserFieldType* pTyp = (SwExtUserFieldType*)pCurShell->GetFldType(
- 0, RES_EXTUSERFLD);
+ 0, RES_EXTUSERFLD);
pFld = new SwExtUserField(pTyp, nSubType, nFormatId);
- break;
- }
- case TYP_DBFLD:
- {
- SwDBData aDBData;
- String sPar1;
+ break;
+ }
+
+ case TYP_DBFLD:
+ {
+ SwDBData aDBData;
+ String sPar1;
if (rData.sPar1.Search(DB_DELIM) == STRING_NOTFOUND)
- {
+ {
aDBData = pCurShell->GetDBData();
sPar1 = rData.sPar1;
- }
- else
- {
+ }
+ else
+ {
aDBData.sDataSource = rData.sPar1.GetToken(0, DB_DELIM);
aDBData.sCommand = rData.sPar1.GetToken(1, DB_DELIM);
aDBData.nCommandType = rData.sPar1.GetToken(2, DB_DELIM).ToInt32();
sPar1 = rData.sPar1.GetToken(3, DB_DELIM);
- }
+ }
if(aDBData.sDataSource.getLength() && pCurShell->GetDBData() != aDBData)
pCurShell->ChgDBData(aDBData);
SwDBFieldType* pTyp = (SwDBFieldType*)pCurShell->InsertFldType(
- SwDBFieldType(pCurShell->GetDoc(), sPar1, aDBData) );
- pFld = new SwDBField(pTyp);
+ SwDBFieldType(pCurShell->GetDoc(), sPar1, aDBData) );
+ pFld = new SwDBField(pTyp);
pFld->SetSubType(nSubType);
if( !(nSubType & nsSwExtendedSubType::SUB_OWN_FMT) ) // Datenbankformat ermitteln
- {
+ {
Reference< XDataSource> xSource;
rData.aDBDataSource >>= xSource;
Reference<XConnection> xConnection;
@@ -1112,132 +1144,135 @@ sal_Bool SwFldMgr::InsertFld( const SwI
if(xColumn.is())
{
nFormatId = pCurShell->GetNewDBMgr()->GetColumnFmt(xSource, xConnection, xColumn,
- pCurShell->GetNumberFormatter(), GetCurrLanguage() );
+ pCurShell->GetNumberFormatter(), GetCurrLanguage() );
}
else
nFormatId = pCurShell->GetNewDBMgr()->GetColumnFmt(
- aDBData.sDataSource, aDBData.sCommand, sPar1,
- pCurShell->GetNumberFormatter(), GetCurrLanguage() );
- }
+ aDBData.sDataSource, aDBData.sCommand, sPar1,
+ pCurShell->GetNumberFormatter(), GetCurrLanguage() );
+ }
pFld->ChangeFormat( nFormatId );
- bExp = sal_True;
- break;
- }
- case TYP_DBSETNUMBERFLD:
- case TYP_DBNUMSETFLD:
- case TYP_DBNEXTSETFLD:
- case TYP_DBNAMEFLD:
- {
- sal_uInt16 nPos, nTablePos, nCmdTypePos, nExpPos;
- String sPar1;
- SwDBData aDBData;
+ bExp = sal_True;
+ break;
+ }
+
+ case TYP_DBSETNUMBERFLD:
+ case TYP_DBNUMSETFLD:
+ case TYP_DBNEXTSETFLD:
+ case TYP_DBNAMEFLD:
+ {
+ sal_uInt16 nPos, nTablePos, nCmdTypePos, nExpPos;
+ String sPar1;
+ SwDBData aDBData;
// DBName aus rData.sPar1 extrahieren. Format: DBName.TableName.CommandType.ExpStrg
if ((nTablePos = rData.sPar1.Search(DB_DELIM)) != STRING_NOTFOUND)
aDBData.sDataSource = rData.sPar1.Copy(0, nTablePos++);
if ((nCmdTypePos = rData.sPar1.Search(DB_DELIM, nTablePos)) != STRING_NOTFOUND)
- {
+ {
aDBData.sCommand = rData.sPar1.Copy(nTablePos, nCmdTypePos++ - nTablePos);
- }
+ }
if ((nExpPos = rData.sPar1.Search(DB_DELIM, nCmdTypePos)) != STRING_NOTFOUND)
- {
+ {
aDBData.nCommandType = rData.sPar1.Copy(nCmdTypePos, nExpPos++ - nCmdTypePos).ToInt32();
- }
- if (nExpPos != STRING_NOTFOUND)
- nPos = nExpPos;
- else if (nTablePos != STRING_NOTFOUND)
- nPos = nTablePos;
- else
- nPos = 0;
+ }
+ if (nExpPos != STRING_NOTFOUND)
+ nPos = nExpPos;
+ else if (nTablePos != STRING_NOTFOUND)
+ nPos = nTablePos;
+ else
+ nPos = 0;
sPar1 = rData.sPar1.Copy(nPos);
if (aDBData.sDataSource.getLength() && pCurShell->GetDBData() != aDBData)
pCurShell->ChgDBData(aDBData);
switch(rData.nTypeId)
- {
- case TYP_DBNAMEFLD:
- {
- SwDBNameFieldType* pTyp =
+ {
+ case TYP_DBNAMEFLD:
+ {
+ SwDBNameFieldType* pTyp =
(SwDBNameFieldType*)pCurShell->GetFldType(0, RES_DBNAMEFLD);
- pFld = new SwDBNameField(pTyp, aDBData);
+ pFld = new SwDBNameField(pTyp, aDBData);
- break;
- }
- case TYP_DBNEXTSETFLD:
- {
+ break;
+ }
+ case TYP_DBNEXTSETFLD:
+ {
SwDBNextSetFieldType* pTyp = (SwDBNextSetFieldType*)pCurShell->GetFldType(
- 0, RES_DBNEXTSETFLD);
+ 0, RES_DBNEXTSETFLD);
pFld = new SwDBNextSetField(pTyp, sPar1, rData.sPar2, aDBData);
- bExp = sal_True;
- break;
- }
- case TYP_DBNUMSETFLD:
- {
+ bExp = sal_True;
+ break;
+ }
+ case TYP_DBNUMSETFLD:
+ {
SwDBNumSetFieldType* pTyp = (SwDBNumSetFieldType*)pCurShell->GetFldType(
- 0, RES_DBNUMSETFLD);
+ 0, RES_DBNUMSETFLD);
pFld = new SwDBNumSetField( pTyp, sPar1, rData.sPar2, aDBData);
- bExp = sal_True;
- break;
- }
- case TYP_DBSETNUMBERFLD:
- {
- SwDBSetNumberFieldType* pTyp = (SwDBSetNumberFieldType*)
- pCurShell->GetFldType(0, RES_DBSETNUMBERFLD);
+ bExp = sal_True;
+ break;
+ }
+ case TYP_DBSETNUMBERFLD:
+ {
+ SwDBSetNumberFieldType* pTyp = (SwDBSetNumberFieldType*)
+ pCurShell->GetFldType(0, RES_DBSETNUMBERFLD);
pFld = new SwDBSetNumberField( pTyp, aDBData, nFormatId);
- bExp = sal_True;
- break;
- }
- }
- break;
- }
- case TYP_USERFLD:
- {
- SwUserFieldType* pTyp =
+ bExp = sal_True;
+ break;
+ }
+ }
+ break;
+ }
+
+ case TYP_USERFLD:
+ {
+ SwUserFieldType* pTyp =
(SwUserFieldType*)pCurShell->GetFldType(RES_USERFLD, rData.sPar1);
- // nur wenn vorhanden
- if(!pTyp)
- {
+ // nur wenn vorhanden
+ if(!pTyp)
+ {
pTyp = (SwUserFieldType*)pCurShell->InsertFldType(
- SwUserFieldType(pCurShell->GetDoc(), rData.sPar1));
- }
+ SwUserFieldType(pCurShell->GetDoc(), rData.sPar1));
+ }
if (pTyp->GetContent(nFormatId) != rData.sPar2)
pTyp->SetContent(rData.sPar2, nFormatId);
pFld = new SwUserField(pTyp, 0, nFormatId);
if (pFld->GetSubType() != nSubType)
pFld->SetSubType(nSubType);
- bTbl = sal_True;
- break;
- }
- case TYP_INPUTFLD:
- {
+ bTbl = sal_True;
+ break;
+ }
+
+ case TYP_INPUTFLD:
+ {
if ((nSubType & 0x00ff) == INP_VAR)
- {
- SwSetExpFieldType* pTyp = (SwSetExpFieldType*)
- pCurShell->GetFldType(RES_SETEXPFLD, rData.sPar1);
+ {
+ SwSetExpFieldType* pTyp = (SwSetExpFieldType*)
+ pCurShell->GetFldType(RES_SETEXPFLD, rData.sPar1);
- // kein Experssion Type mit dem Namen vorhanden -> anlegen
- if(pTyp)
- {
- SwSetExpField* pExpFld =
+ // kein Experssion Type mit dem Namen vorhanden -> anlegen
+ if(pTyp)
+ {
+ SwSetExpField* pExpFld =
new SwSetExpField(pTyp, aEmptyStr, nFormatId);
- // Typ vom SwSetExpFieldType nicht veraendern:
- sal_uInt16 nOldSubType = pExpFld->GetSubType();
+ // Typ vom SwSetExpFieldType nicht veraendern:
+ sal_uInt16 nOldSubType = pExpFld->GetSubType();
pExpFld->SetSubType(nOldSubType | (nSubType & 0xff00));
pExpFld->SetPromptText(rData.sPar2);
- pExpFld->SetInputFlag(sal_True) ;
- bExp = sal_True;
- pFld = pExpFld;
- }
- else
- return sal_False;
- }
- else
- {
+ pExpFld->SetInputFlag(sal_True) ;
+ bExp = sal_True;
+ pFld = pExpFld;
+ }
+ else
+ return sal_False;
+ }
+ else
+ {
SwInputFieldType* pTyp =
(SwInputFieldType*)pCurShell->GetFldType(0, RES_INPUTFLD);
@@ -1246,122 +1281,128 @@ sal_Bool SwFldMgr::InsertFld( const SwI
pFld = pInpFld;
}
- // Dialog starten
- //
+ // Dialog starten
+ //
pCurShell->StartInputFldDlg(pFld, sal_False, rData.pParent);
- break;
- }
- case TYP_SETFLD:
- {
+ break;
+ }
+
+ case TYP_SETFLD:
+ {
if (!rData.sPar2.Len()) // Leere Variablen sind nicht erlaubt
- return sal_False;
+ return sal_False;
SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pCurShell->InsertFldType(
- SwSetExpFieldType(pCurShell->GetDoc(), rData.sPar1) );
+ SwSetExpFieldType(pCurShell->GetDoc(), rData.sPar1) );
SwSetExpField* pExpFld = new SwSetExpField( pTyp, rData.sPar2, nFormatId);
pExpFld->SetSubType(nSubType);
pExpFld->SetPar2(rData.sPar2);
- bExp = sal_True;
- pFld = pExpFld;
- break;
- }
- case TYP_SEQFLD:
- {
+ bExp = sal_True;
+ pFld = pExpFld;
+ break;
+ }
+
+ case TYP_SEQFLD:
+ {
SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pCurShell->InsertFldType(
- SwSetExpFieldType(pCurShell->GetDoc(), rData.sPar1, nsSwGetSetExpType::GSE_SEQ));
+ SwSetExpFieldType(pCurShell->GetDoc(), rData.sPar1, nsSwGetSetExpType::GSE_SEQ));
sal_uInt8 nLevel = static_cast< sal_uInt8 >(nSubType & 0xff);
- pTyp->SetOutlineLvl(nLevel);
+ pTyp->SetOutlineLvl(nLevel);
if (nLevel != 0x7f && cSeparator == 0)
cSeparator = '.';
pTyp->SetDelimiter(cSeparator);
SwSetExpField* pExpFld = new SwSetExpField(pTyp, rData.sPar2, nFormatId);
- bExp = sal_True;
- pFld = pExpFld;
+ bExp = sal_True;
+ pFld = pExpFld;
nSubType = nsSwGetSetExpType::GSE_SEQ;
- break;
- }
- case TYP_GETFLD:
- {
- // gibt es ein entprechendes SetField
- SwSetExpFieldType* pSetTyp = (SwSetExpFieldType*)
- pCurShell->GetFldType(RES_SETEXPFLD, rData.sPar1);
+ break;
+ }
- if(pSetTyp)
- {
+ case TYP_GETFLD:
+ {
+ // gibt es ein entprechendes SetField
+ SwSetExpFieldType* pSetTyp = (SwSetExpFieldType*)
+ pCurShell->GetFldType(RES_SETEXPFLD, rData.sPar1);
+
+ if(pSetTyp)
+ {
SwGetExpFieldType* pTyp = (SwGetExpFieldType*)pCurShell->GetFldType(
- 0, RES_GETEXPFLD);
+ 0, RES_GETEXPFLD);
pFld = new SwGetExpField(pTyp, rData.sPar1, pSetTyp->GetType(), nFormatId);
pFld->SetSubType(nSubType | pSetTyp->GetType());
- bExp = sal_True;
- }
- else
- return sal_False;
- break;
- }
- case TYP_FORMELFLD:
- {
+ bExp = sal_True;
+ }
+ else
+ return sal_False;
+ break;
+ }
+
+ case TYP_FORMELFLD:
+ {
if(pCurShell->GetFrmType(0,sal_False) & FRMTYPE_TABLE)
- {
+ {
pCurShell->StartAllAction();
SvNumberFormatter* pFormatter = pCurShell->GetDoc()->GetNumberFormatter();
const SvNumberformat* pEntry = pFormatter->GetEntry(nFormatId);
- if (pEntry)
- {
- SfxStringItem aFormat(FN_NUMBER_FORMAT, pEntry->GetFormatstring());
+ if (pEntry)
+ {
+ SfxStringItem aFormat(FN_NUMBER_FORMAT, pEntry->GetFormatstring());
pCurShell->GetView().GetViewFrame()->GetDispatcher()->
- Execute(FN_NUMBER_FORMAT, SFX_CALLMODE_SYNCHRON, &aFormat, 0L);
- }
+ Execute(FN_NUMBER_FORMAT, SFX_CALLMODE_SYNCHRON, &aFormat, 0L);
+ }
SfxItemSet aBoxSet( pCurShell->GetAttrPool(),
- RES_BOXATR_FORMULA, RES_BOXATR_FORMULA );
+ RES_BOXATR_FORMULA, RES_BOXATR_FORMULA );
String sFml( rData.sPar2 );
- if( sFml.EraseLeadingChars().Len() &&
- '=' == sFml.GetChar( 0 ) )
- sFml.Erase( 0, 1 );
+ if( sFml.EraseLeadingChars().Len() &&
+ '=' == sFml.GetChar( 0 ) )
+ sFml.Erase( 0, 1 );
- aBoxSet.Put( SwTblBoxFormula( sFml ));
+ aBoxSet.Put( SwTblBoxFormula( sFml ));
pCurShell->SetTblBoxFormulaAttrs( aBoxSet );
pCurShell->UpdateTable();
pCurShell->EndAllAction();
- return sal_True;
+ return sal_True;
-/* // In der Tabelle Tabellenformeln einfuegen
+ /* // In der Tabelle Tabellenformeln einfuegen
SwTblFieldType* pTyp = (SwTblFieldType*)pCurShell->GetFldType(
- 0, RES_TABLEFLD);
+ 0, RES_TABLEFLD);
pFld = new SwTblField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_EXPR, nFormatId);
- bTbl = sal_True;*/
- }
- else
- {
- SwGetExpFieldType* pTyp = (SwGetExpFieldType*)
- pCurShell->GetFldType(0, RES_GETEXPFLD);
+ bTbl = sal_True;*/
+ }
+ else
+ {
+ SwGetExpFieldType* pTyp = (SwGetExpFieldType*)
+ pCurShell->GetFldType(0, RES_GETEXPFLD);
pFld = new SwGetExpField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_FORMULA, nFormatId);
pFld->SetSubType(nSubType);
- bExp = sal_True;
- }
- break;
- }
- case TYP_SETREFPAGEFLD:
- pFld = new SwRefPageSetField( (SwRefPageSetFieldType*)
- pCurShell->GetFldType( 0, RES_REFPAGESETFLD ),
- (short)rData.sPar2.ToInt32(), 0 != nSubType );
- bPageVar = sal_True;
- break;
+ bExp = sal_True;
+ }
+ break;
+ }
- case TYP_GETREFPAGEFLD:
- pFld = new SwRefPageGetField( (SwRefPageGetFieldType*)
- pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ), nFormatId );
- bPageVar = sal_True;
- break;
- case TYP_DROPDOWN :
+ case TYP_SETREFPAGEFLD:
+ pFld = new SwRefPageSetField( (SwRefPageSetFieldType*)
+ pCurShell->GetFldType( 0, RES_REFPAGESETFLD ),
+ (short)rData.sPar2.ToInt32(), 0 != nSubType );
+ bPageVar = sal_True;
+ break;
+
+ case TYP_GETREFPAGEFLD:
+ pFld = new SwRefPageGetField( (SwRefPageGetFieldType*)
+ pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ), nFormatId );
+ bPageVar = sal_True;
+ break;
+
+ case TYP_DROPDOWN :
{
pFld = new SwDropDownField(pCurShell->GetFldType( 0, RES_DROPDOWN ));
xub_StrLen nTokenCount = rData.sPar2.Len() ? rData.sPar2.GetTokenCount(DB_DELIM) : 0;
@@ -1373,43 +1414,45 @@ sal_Bool SwFldMgr::InsertFld( const SwI
((SwDropDownField*)pFld)->SetName(rData.sPar1);
}
break;
- default:
- { ASSERT(!this, "Falscher Feldtyp");
- return sal_False;
- }
- }
- ASSERT(pFld, "Feld nicht vorhanden");
+
+ default:
+ {
+ ASSERT(!this, "Falscher Feldtyp");
+ return sal_False;
+ }
+ }
+ ASSERT(pFld, "Feld nicht vorhanden");
- //the auto language flag has to be set prior to the language!
- pFld->SetAutomaticLanguage(rData.bIsAutomaticLanguage);
- sal_uInt16 nLang = GetCurrLanguage();
- pFld->SetLanguage(nLang);
+ //the auto language flag has to be set prior to the language!
+ pFld->SetAutomaticLanguage(rData.bIsAutomaticLanguage);
+ sal_uInt16 nLang = GetCurrLanguage();
+ pFld->SetLanguage(nLang);
- // Einfuegen
+ // Einfuegen
pCurShell->StartAllAction();
- pCurShell->Insert(*pFld);
+ pCurShell->Insert( *pFld );
- if(bExp && bEvalExp)
+ if(bExp && bEvalExp)
pCurShell->UpdateExpFlds(sal_True);
- if(bTbl)
- {
+ if(bTbl)
+ {
pCurShell->Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
pCurShell->UpdateFlds(*pFld);
pCurShell->Right(CRSR_SKIP_CHARS, sal_False, 1, sal_False );
- }
- else if( bPageVar )
+ }
+ else if( bPageVar )
((SwRefPageGetFieldType*)pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ))->UpdateFlds();
else if( TYP_GETREFFLD == rData.nTypeId )
- pFld->GetTyp()->ModifyNotification( 0, 0 );
+ pFld->GetTyp()->ModifyNotification( 0, 0 );
- // temporaeres Feld loeschen
- delete pFld;
+ // temporaeres Feld loeschen
+ delete pFld;
pCurShell->EndAllAction();
- return sal_True;
+ return sal_True;
}
/*--------------------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/fldui/fldref.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/fldui/fldref.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/fldui/fldref.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/fldui/fldref.cxx Fri Jan 3 14:44:44 2014
@@ -513,7 +513,6 @@ void SwFldRefPage::UpdateSubType()
const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel());
String sOldSel;
- // --> OD 2007-11-22 #i83479#
if ( aSelectionLB.IsVisible() )
{
const sal_uInt16 nSelectionSel = aSelectionLB.GetSelectEntryPos();
@@ -522,17 +521,14 @@ void SwFldRefPage::UpdateSubType()
sOldSel = aSelectionLB.GetEntry(nSelectionSel);
}
}
- // <--
if (IsFldEdit() && !sOldSel.Len())
sOldSel = String::CreateFromInt32( pRefFld->GetSeqNo() + 1 );
aSelectionLB.SetUpdateMode(sal_False);
aSelectionLB.Clear();
- // --> OD 2007-11-21 #i83479#
aSelectionToolTipLB.SetUpdateMode(sal_False);
aSelectionToolTipLB.Clear();
bool bShowSelectionToolTipLB( false );
- // <--
if( REFFLDFLAG & nTypeId )
{
@@ -578,7 +574,6 @@ void SwFldRefPage::UpdateSubType()
sOldSel = aArr[n]->sDlgEntry;
}
}
- // --> OD 2007-11-14 #i83479#
else if ( nTypeId == REFFLDFLAG_HEADING )
{
bShowSelectionToolTipLB = true;
@@ -639,7 +634,6 @@ void SwFldRefPage::UpdateSubType()
}
}
}
- // <--
else
{
aSelectionLB.SetStyle(aSelectionLB.GetStyle()|WB_SORT);
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/inc/fldmgr.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/inc/fldmgr.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/inc/fldmgr.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/inc/fldmgr.hxx Fri Jan 3 14:44:44 2014
@@ -44,6 +44,7 @@ namespace com{namespace sun{namespace st
class SwWrtShell;
class SwField;
class SwFieldType;
+class SwPaM;
class SbModule;
class SvxMacroItem;
class SvNumberFormatter;
@@ -136,8 +137,8 @@ public:
void SetWrtShell( SwWrtShell* pShell )
{ pWrtShell = pShell; }
- // Feld einfuegen ueber TypeId (TYP_ ...)
- sal_Bool InsertFld( const SwInsertFld_Data& rData );
+ // insert field using TypeID (TYP_ ...)
+ sal_Bool InsertFld( const SwInsertFld_Data& rData );
// Direkt das aktuelle Feld aendern
void UpdateCurFld(sal_uLong nFormat,
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/inc/wrtsh.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/inc/wrtsh.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/inc/wrtsh.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/inc/wrtsh.hxx Fri Jan 3 14:44:44 2014
@@ -297,8 +297,10 @@ typedef sal_Bool (SwWrtShell:: *FNSimple
int IntelligentCut(int nSelectionType, sal_Bool bCut = sal_True);
// Editieren
- void Insert(SwField &);
+ void Insert( SwField& rFld );
+
void Insert(const String &);
+
// Graphic
void Insert( const String &rPath, const String &rFilter,
const Graphic &, SwFlyFrmAttrMgr * = 0,
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/shells/textfld.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/shells/textfld.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/shells/textfld.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/shells/textfld.cxx Fri Jan 3 14:44:44 2014
@@ -354,53 +354,56 @@ void SwTextShell::ExecField(SfxRequest &
GetView().GetPostItMgr()->Hide( pNoteItem->GetValue() );
}
break;
- case FN_POSTIT:
- {
- SwPostItField* pPostIt = dynamic_cast<SwPostItField*>(aFldMgr.GetCurFld());
- sal_Bool bNew = !(pPostIt && pPostIt->GetTyp()->Which() == RES_POSTITFLD);
- if (bNew || GetView().GetPostItMgr()->IsAnswer())
- {
- SvtUserOptions aUserOpt;
- String sAuthor;
- if( !(sAuthor = aUserOpt.GetFullName()).Len())
- if( !(sAuthor = aUserOpt.GetID()).Len() )
- sAuthor = String( SW_RES( STR_REDLINE_UNKNOWN_AUTHOR ));
- if( rSh.HasSelection() )
- {
- rSh.NormalizePam(true);
- rSh.KillPams();
- rSh.ClearMark();
- }
-
- // #120513# Inserting a comment into an autocompletion crashes
- // --> suggestion has to be removed before
- GetView().GetEditWin().StopQuickHelp();
-
- SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyStr, 0);
- aFldMgr.InsertFld(aData);
- rSh.Push();
- rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, sal_False);
- pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
- rSh.Pop(sal_False); // Cursorpos restaurieren
- }
- if (pPostIt)
- {
- SwFieldType* pType = rSh.GetDoc()->GetFldType(RES_POSTITFLD, aEmptyStr,false);
- SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
- SwFmtFld* pSwFmtFld = aIter.First();
- while( pSwFmtFld )
- {
- if ( pSwFmtFld->GetField() == pPostIt )
- {
- pSwFmtFld->Broadcast( SwFmtFldHint( 0, SWFMTFLD_FOCUS, &GetView() ) );
- break;
- }
- pSwFmtFld = aIter.Next();
- }
- }
- }
- break;
+ case FN_POSTIT:
+ {
+ SwPostItField* pPostIt = dynamic_cast<SwPostItField*>(aFldMgr.GetCurFld());
+ sal_Bool bNew = !(pPostIt && pPostIt->GetTyp()->Which() == RES_POSTITFLD);
+ if (bNew || GetView().GetPostItMgr()->IsAnswer())
+ {
+ SvtUserOptions aUserOpt;
+ String sAuthor;
+ if( !(sAuthor = aUserOpt.GetFullName()).Len())
+ if( !(sAuthor = aUserOpt.GetID()).Len() )
+ sAuthor = String( SW_RES( STR_REDLINE_UNKNOWN_AUTHOR ));
+
+ if( rSh.HasSelection() )
+ {
+ rSh.NormalizePam( sal_False );
+ rSh.KillPams();
+ }
+
+ // #120513# Inserting a comment into an autocompletion crashes
+ // --> suggestion has to be removed before
+ GetView().GetEditWin().StopQuickHelp();
+
+ SwInsertFld_Data aData(TYP_POSTITFLD, 0, sAuthor, aEmptyStr, 0);
+ aFldMgr.InsertFld( aData );
+
+ rSh.Push();
+ rSh.SwCrsrShell::Left(1, CRSR_SKIP_CHARS, sal_False);
+ pPostIt = (SwPostItField*)aFldMgr.GetCurFld();
+ rSh.Pop(sal_False); // Cursorpos restaurieren
+ }
+
+ if (pPostIt)
+ {
+ SwFieldType* pType = rSh.GetDoc()->GetFldType(RES_POSTITFLD, aEmptyStr,false);
+ SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
+ SwFmtFld* pSwFmtFld = aIter.First();
+ while( pSwFmtFld )
+ {
+ if ( pSwFmtFld->GetField() == pPostIt )
+ {
+ pSwFmtFld->Broadcast( SwFmtFldHint( 0, SWFMTFLD_FOCUS, &GetView() ) );
+ break;
+ }
+ pSwFmtFld = aIter.Next();
+ }
+ }
+ }
+ break;
+
case FN_REDLINE_COMMENT:
{
/* this code can be used once we want redline comments in the margin, all other stuff can
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/uiview/view2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/uiview/view2.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/uiview/view2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/uiview/view2.cxx Fri Jan 3 14:44:44 2014
@@ -1934,7 +1934,7 @@ sal_Bool SwView::JumpToSwMark( const Str
bRet = sal_True;
}
}
- else if( pMarkAccess->getMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)) )
+ else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)) )
pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = sal_True;
else if( 0 != ( pINet = pWrtShell->FindINetAttr( sMark ) ))
bRet = pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() );
@@ -1956,7 +1956,7 @@ sal_Bool SwView::JumpToSwMark( const Str
}
}
}
- else if( pMarkAccess->getMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)))
+ else if( pMarkAccess->getAllMarksEnd() != (ppMark = pMarkAccess->findMark(sMark)))
pWrtShell->GotoMark( ppMark->get(), sal_False, sal_True ), bRet = sal_True;
else if( 0 != ( pINet = pWrtShell->FindINetAttr( sMark ) ))
bRet = pWrtShell->GotoINetAttr( *pINet->GetTxtINetFmt() );
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/uiview/viewmdi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/uiview/viewmdi.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/uiview/viewmdi.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/uiview/viewmdi.cxx Fri Jan 3 14:44:44 2014
@@ -455,8 +455,8 @@ IMPL_STATIC_LINK( SwView, MoveNavigation
// collect navigator reminders
IDocumentMarkAccess* const pMarkAccess = rSh.getIDocumentMarkAccess();
::std::vector< const ::sw::mark::IMark* > vNavMarks;
- for( IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getMarksBegin();
- ppMark != pMarkAccess->getMarksEnd();
+ for( IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAllMarksBegin();
+ ppMark != pMarkAccess->getAllMarksEnd();
ppMark++)
{
if( IDocumentMarkAccess::GetType(**ppMark) == IDocumentMarkAccess::NAVIGATOR_REMINDER )
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/bookctrl.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/bookctrl.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/bookctrl.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/bookctrl.cxx Fri Jan 3 14:44:44 2014
@@ -128,7 +128,7 @@ void SwBookmarkControl::Command( const C
CaptureMouse();
BookmarkPopup_Impl aPop;
SwWrtShell* pWrtShell = ::GetActiveWrtShell();
- if( pWrtShell && pWrtShell->getIDocumentMarkAccess()->getMarksCount() > 0 )
+ if( pWrtShell && pWrtShell->getIDocumentMarkAccess()->getAllMarksCount() > 0 )
{
IDocumentMarkAccess* const pMarkAccess = pWrtShell->getIDocumentMarkAccess();
IDocumentMarkAccess::const_iterator_t ppBookmarkStart = pMarkAccess->getBookmarksBegin();
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/content.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/content.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/content.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/content.cxx Fri Jan 3 14:44:44 2014
@@ -418,7 +418,7 @@ void SwContentType::Init(sal_Bool* pbInv
{
if ( (*i)->GetBroadCaster()->ISA(SwFmtFld)) // SwPostit
{
- SwFmtFld* aFmtFld = static_cast<SwFmtFld*>((*i)->GetBroadCaster());
+ const SwFmtFld* aFmtFld = static_cast<const SwFmtFld*>((*i)->GetBroadCaster());
if (aFmtFld->GetTxtFld() && aFmtFld->IsFldInDoc() &&
(*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
{
@@ -427,7 +427,7 @@ void SwContentType::Init(sal_Bool* pbInv
SwPostItContent* pCnt = new SwPostItContent(
this,
sEntry,
- (const SwFmtFld*)aFmtFld,
+ aFmtFld,
nMemberCount);
pMember->Insert(pCnt);
nMemberCount++;
@@ -766,7 +766,7 @@ void SwContentType::FillMemberList(sal_B
{
if ( (*i)->GetBroadCaster()->ISA(SwFmtFld)) // SwPostit
{
- SwFmtFld* aFmtFld = static_cast<SwFmtFld*>((*i)->GetBroadCaster());
+ const SwFmtFld* aFmtFld = static_cast<const SwFmtFld*>((*i)->GetBroadCaster());
if (aFmtFld->GetTxtFld() && aFmtFld->IsFldInDoc() &&
(*i)->mLayoutStatus!=SwPostItHelper::INVISIBLE )
{
@@ -775,7 +775,7 @@ void SwContentType::FillMemberList(sal_B
SwPostItContent* pCnt = new SwPostItContent(
this,
sEntry,
- (const SwFmtFld*)aFmtFld,
+ aFmtFld,
nMemberCount);
pMember->Insert(pCnt);
nMemberCount++;
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/navipi.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/navipi.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/navipi.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/utlui/navipi.cxx Fri Jan 3 14:44:44 2014
@@ -598,8 +598,8 @@ void SwNavigationPI::MakeMark()
// collect and sort navigator reminder names
::std::vector< ::rtl::OUString > vNavMarkNames;
- for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getMarksBegin();
- ppMark != pMarkAccess->getMarksEnd();
+ for(IDocumentMarkAccess::const_iterator_t ppMark = pMarkAccess->getAllMarksBegin();
+ ppMark != pMarkAccess->getAllMarksEnd();
ppMark++)
if( IDocumentMarkAccess::GetType(**ppMark) == IDocumentMarkAccess::NAVIGATOR_REMINDER )
vNavMarkNames.push_back(ppMark->get()->GetName());
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh2.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh2.cxx Fri Jan 3 14:44:44 2014
@@ -74,27 +74,51 @@
Beschreibung:
------------------------------------------------------------------------*/
-void SwWrtShell::Insert(SwField &rFld)
+void SwWrtShell::Insert( SwField& rFld )
{
- ResetCursorStack();
- if(!_CanInsert())
- return;
- StartAllAction();
+ ResetCursorStack();
+ if(!_CanInsert())
+ return;
+ StartAllAction();
SwRewriter aRewriter;
aRewriter.AddRule(UNDO_ARG1, rFld.GetDescription());
- StartUndo(UNDO_INSERT, &aRewriter);
+ StartUndo(UNDO_INSERT, &aRewriter);
bool bDeleted = false;
- if( HasSelection() )
+ const SwPaM* pAnnotationTextRange = NULL;
+ if ( HasSelection() )
{
- bDeleted = DelRight() != 0;
+ if ( rFld.GetTyp()->Which() == RES_POSTITFLD )
+ {
+ // for annotation fields:
+ // - keep the current selection in order to create a corresponding annotation mark
+ // - collapse cursur to its point
+ const SwPaM& rCurrPaM = GetCurrentShellCursor();
+ pAnnotationTextRange = new SwPaM( *rCurrPaM.GetPoint(), *rCurrPaM.GetMark() );
+ ClearMark();
+ }
+ else
+ {
+ bDeleted = DelRight() != 0;
+ }
}
SwEditShell::Insert2(rFld, bDeleted);
+
+ if ( pAnnotationTextRange != NULL )
+ {
+ if ( GetDoc() != NULL )
+ {
+ IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess();
+ pMarksAccess->makeAnnotationMark( *pAnnotationTextRange, ::rtl::OUString() );
+ }
+ delete pAnnotationTextRange;
+ }
+
EndUndo();
- EndAllAction();
+ EndAllAction();
}
/*--------------------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh3.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh3.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sw/source/ui/wrtsh/wrtsh3.cxx Fri Jan 3 14:44:44 2014
@@ -147,7 +147,7 @@ void SwWrtShell::DrawSelChanged( )
sal_Bool SwWrtShell::GotoMark( const ::rtl::OUString& rName )
{
IDocumentMarkAccess::const_iterator_t ppMark = getIDocumentMarkAccess()->findMark( rName );
- if(ppMark == getIDocumentMarkAccess()->getMarksEnd()) return false;
+ if(ppMark == getIDocumentMarkAccess()->getAllMarksEnd()) return false;
return MoveBookMark( BOOKMARK_INDEX, ppMark->get() );
}
Modified: openoffice/branches/rejuvenate01/main/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx (original)
+++ openoffice/branches/rejuvenate01/main/toolkit/inc/toolkit/controls/controlmodelcontainerbase.hxx Fri Jan 3 14:44:44 2014
@@ -85,8 +85,7 @@ protected:
AllGroups maGroups;
sal_Bool mbGroupsUpToDate;
- bool m_bEnabled;
- ::rtl::OUString m_sTitle;
+ sal_Bool m_bEnabled;
::rtl::OUString m_sImageURL;
::rtl::OUString m_sTooltip;
sal_Int16 m_nTabPageId;
Modified: openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxtabpagecontainer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxtabpagecontainer.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxtabpagecontainer.cxx (original)
+++ openoffice/branches/rejuvenate01/main/toolkit/source/awt/vclxtabpagecontainer.cxx Fri Jan 3 14:44:44 2014
@@ -208,6 +208,7 @@ void SAL_CALL VCLXTabPageContainer::elem
pTabCtrl->SetHelpText(nPageID,xP->getToolTip());
pTabCtrl->SetPageImage(nPageID,TkResMgr::getImageFromURL(xP->getImageURL()));
pTabCtrl->SelectTabPage(nPageID);
+ pTabCtrl->EnablePage(nPageID,xP->getEnabled());
m_aTabPages.push_back(xTabPage);
}
}
Modified: openoffice/branches/rejuvenate01/main/toolkit/source/controls/controlmodelcontainerbase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/source/controls/controlmodelcontainerbase.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/toolkit/source/controls/controlmodelcontainerbase.cxx (original)
+++ openoffice/branches/rejuvenate01/main/toolkit/source/controls/controlmodelcontainerbase.cxx Fri Jan 3 14:44:44 2014
@@ -221,6 +221,7 @@ ControlModelContainerBase::ControlModelC
,maContainerListeners( *this )
,maChangeListeners ( GetMutex() )
,mbGroupsUpToDate( sal_False )
+ ,m_bEnabled( sal_True )
{
}
@@ -765,7 +766,6 @@ void SAL_CALL ControlModelContainerBase:
::rtl::OUString sTitle;
xThis->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)) >>= sTitle;
return sTitle;
- //return m_sTitle;
}
void SAL_CALL ControlModelContainerBase::setTitle( const ::rtl::OUString& _title ) throw (::com::sun::star::uno::RuntimeException)
{
Modified: openoffice/branches/rejuvenate01/main/toolkit/source/controls/tabpagemodel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/toolkit/source/controls/tabpagemodel.cxx?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/toolkit/source/controls/tabpagemodel.cxx (original)
+++ openoffice/branches/rejuvenate01/main/toolkit/source/controls/tabpagemodel.cxx Fri Jan 3 14:44:44 2014
@@ -80,8 +80,6 @@ UnoControlTabPageModel::UnoControlTabPag
ImplRegisterProperty( BASEPROPERTY_TITLE );
ImplRegisterProperty( BASEPROPERTY_HELPTEXT );
ImplRegisterProperty( BASEPROPERTY_HELPURL );
- ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
- ImplRegisterProperty( BASEPROPERTY_ENABLED );
}
::rtl::OUString UnoControlTabPageModel::getServiceName( ) throw(RuntimeException)
@@ -166,9 +164,7 @@ void SAL_CALL UnoControlTabPageModel::in
Reference<XPropertySet> xThis(*this,UNO_QUERY);
xThis->setPropertyValue(s_sResourceResolver,xDialogProp->getPropertyValue(s_sResourceResolver));
xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_TITLE),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_TITLE)));
- xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL)));
xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPTEXT)));
- xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_ENABLED)));
xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL),xDialogProp->getPropertyValue(GetPropertyName(BASEPROPERTY_HELPURL)));
}
}
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/beans/Pair.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/beans/Pair.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/beans/Pair.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/beans/Pair.idl Fri Jan 3 14:44:44 2014
@@ -34,7 +34,7 @@ module com { module sun { module star
any type, and could be useful as the result type of methods.
</p>
- @since OOo 3.0
+ @since OpenOffice 3.0
*/
published struct Pair<T, U> {
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/beans/PropertyAttribute.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/beans/PropertyAttribute.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/beans/PropertyAttribute.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/beans/PropertyAttribute.idl Fri Jan 3 14:44:44 2014
@@ -105,7 +105,7 @@ published constants PropertyAttribute
@see com::sun::star::reflection::XPropertyTypeDescription
@see com::sun::star::reflection::XServiceTypeDescription
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
const short OPTIONAL = 256;
};
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Currency.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Currency.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Currency.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Currency.idl Fri Jan 3 14:44:44 2014
@@ -42,7 +42,7 @@ module com { module sun { module star
<type>Currency</type> is declared as struct.
</p>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
struct Currency
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Date.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Date.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Date.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Date.idl Fri Jan 3 14:44:44 2014
@@ -41,7 +41,7 @@ module com { module sun { module star
is declared as struct.
</p>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
struct Date
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Decimal.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Decimal.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Decimal.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/Decimal.idl Fri Jan 3 14:44:44 2014
@@ -29,7 +29,7 @@ module com { module sun { module star
/** is the UNO representation of the Automation type <code>DECIMAL</code>.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
struct Decimal
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/NamedArgument.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/NamedArgument.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/NamedArgument.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/NamedArgument.idl Fri Jan 3 14:44:44 2014
@@ -38,7 +38,7 @@ module com { module sun { module star
named arguments, otherwise the call fails.
</p>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
struct NamedArgument
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/PropertyPutArgument.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/PropertyPutArgument.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/PropertyPutArgument.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/PropertyPutArgument.idl Fri Jan 3 14:44:44 2014
@@ -51,7 +51,7 @@ module com { module sun { module star
<type>PropertyGetArgument</type> as arguments to
<member scope="com::sun::star::script">XInvocation::Invoke</member>.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
struct PropertyPutArgument
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/SCode.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/SCode.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/SCode.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/SCode.idl Fri Jan 3 14:44:44 2014
@@ -43,7 +43,7 @@ module com { module sun { module star
declared as struct.
</p>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/bridge/oleautomation/XAutomationObject.idl Fri Jan 3 14:44:44 2014
@@ -41,7 +41,7 @@ module com { module sun { module star
By providing <type>XAutomationObject</type> an object declares
to be representing an Automation object.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
interface XAutomationObject: com::sun::star::uno::XInterface
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/connection/SocketPermission.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/connection/SocketPermission.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/connection/SocketPermission.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/connection/SocketPermission.idl Fri Jan 3 14:44:44 2014
@@ -81,7 +81,7 @@ SocketPermission("localhost:1024-", "acc
confidential data among parties who may not otherwise have access to the data.
</p>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published struct SocketPermission
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/container/XStringKeyMap.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/container/XStringKeyMap.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/container/XStringKeyMap.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/container/XStringKeyMap.idl Fri Jan 3 14:44:44 2014
@@ -52,7 +52,7 @@ module com { module sun { module star
/** maps strings to anys.
- @since OOo 2.3
+ @since OpenOffice 2.3
*/
interface XStringKeyMap
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/FilePermission.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/FilePermission.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/FilePermission.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/FilePermission.idl Fri Jan 3 14:44:44 2014
@@ -61,7 +61,7 @@ module com { module sun { module star
The <code>"<<ALL FILES>>"</code> permission with write action is
especially dangerous. This grants permission to write to the entire file system.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published struct FilePermission
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/TempFile.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/TempFile.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/TempFile.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/TempFile.idl Fri Jan 3 14:44:44 2014
@@ -40,4 +40,4 @@ published service TempFile : XTempFile;
}; }; }; };
-#endif
\ No newline at end of file
+#endif
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/io/XAsyncOutputMonitor.idl Fri Jan 3 14:44:44 2014
@@ -55,7 +55,7 @@ module com { module sun { module star {
should be called after the series of calls to
<member scope="com::sun::star::io">XOutputStream::writeBytes</member>.</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XAsyncOutputMonitor {
/**
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/InvalidJavaSettingsException.idl Fri Jan 3 14:44:44 2014
@@ -37,7 +37,7 @@ module com { module sun { module star {
by distributors to determine what versions are supported. If this
file is modified, then the current settings are regarded as invalid.</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
exception InvalidJavaSettingsException: JavaInitializationException
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaDisabledException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaDisabledException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaDisabledException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaDisabledException.idl Fri Jan 3 14:44:44 2014
@@ -36,7 +36,7 @@ module com { module sun { module star {
The user has switched off Java in the configuration of the office,
for example by means of the options dialog.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published exception JavaDisabledException: JavaInitializationException
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaInitializationException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaInitializationException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaInitializationException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaInitializationException.idl Fri Jan 3 14:44:44 2014
@@ -44,7 +44,7 @@ module com { module sun { module star {
<type scope:"com::sun::star::java">MissingJavaRuntimeException</type> <br>
<type scope:"com::sun::star::java">JavaVMCreationFailureException</type> <br>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published exception JavaInitializationException: com::sun::star::uno::DeploymentException
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaNotConfiguredException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaNotConfiguredException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaNotConfiguredException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaNotConfiguredException.idl Fri Jan 3 14:44:44 2014
@@ -35,7 +35,7 @@ module com { module sun { module star {
This exception occurs if there is no java.ini or javarc available. This usually
happens if a user cancels the Java configuration which of the office.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published exception JavaNotConfiguredException: JavaInitializationException
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaNotFoundException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaNotFoundException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaNotFoundException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaNotFoundException.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star {
/** indicates that no suitable JRE was found.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
exception JavaNotFoundException: JavaInitializationException
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/JavaVMCreationFailureException.idl Fri Jan 3 14:44:44 2014
@@ -40,7 +40,7 @@ module com { module sun { module star {
library is corrupted, so that the symbols for JNI_GetDefaultVMInitArgs
or JNI_CreateJavaVM cannot be found, etc.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published exception JavaVMCreationFailureException: JavaInitializationException
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/MissingJavaRuntimeException.idl Fri Jan 3 14:44:44 2014
@@ -35,7 +35,7 @@ module com { module sun { module star {
This happens when a user moves or deletes a Java installation after
the office has been configured to use that Java installation.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published exception MissingJavaRuntimeException: JavaInitializationException
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/RestartRequiredException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/RestartRequiredException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/RestartRequiredException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/java/RestartRequiredException.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@ module com { module sun { module star {
/** indicates that the office must be restarted before a JRE can be used.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
exception RestartRequiredException: JavaInitializationException
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/InvalidTypeNameException.idl Fri Jan 3 14:44:44 2014
@@ -37,7 +37,7 @@
/** thrown in case that a certain type name does exist, but does not meet
some other criteria.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published exception InvalidTypeNameException : com::sun::star::uno::Exception
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/NoSuchTypeNameException.idl Fri Jan 3 14:44:44 2014
@@ -36,7 +36,7 @@
/** thrown in case that a certain type name does not exist.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published exception NoSuchTypeNameException : com::sun::star::uno::Exception
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionManager.idl Fri Jan 3 14:44:44 2014
@@ -106,7 +106,7 @@ published service TypeDescriptionManager
/** Interface for creating enumerations for type descriptions supported
by this <type>TypeDescriptionManager</type>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
[optional] interface XTypeDescriptionEnumerationAccess;
};
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionProvider.idl Fri Jan 3 14:44:44 2014
@@ -71,7 +71,7 @@ published service TypeDescriptionProvide
/** Interface for creating enumerations for type descriptions supported
by this <type>TypeDescriptionProvider</type>
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
[optional] interface XTypeDescriptionEnumerationAccess;
};
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionSearchDepth.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionSearchDepth.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionSearchDepth.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/TypeDescriptionSearchDepth.idl Fri Jan 3 14:44:44 2014
@@ -33,7 +33,7 @@
/** Defines depths for searching through type description collections.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published enum TypeDescriptionSearchDepth
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XConstantTypeDescription.idl Fri Jan 3 14:44:44 2014
@@ -44,7 +44,7 @@
@see XModuleTypeDescription
@see XConstantsTypeDescription
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XConstantTypeDescription : com::sun::star::reflection::XTypeDescription
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XConstantsTypeDescription.idl Fri Jan 3 14:44:44 2014
@@ -43,7 +43,7 @@
<p>The type class of this type is
<member scope="com::sun::star::uno">TypeClass::CONSTANTS</member>.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XConstantsTypeDescription : com::sun::star::reflection::XTypeDescription
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XInterfaceAttributeTypeDescription2.idl Fri Jan 3 14:44:44 2014
@@ -37,7 +37,7 @@ interface XCompoundTypeDescription;
<p>This type supersedes <type>XInterfaceAttributeTypeDescription</type>,
which does not support extended attributes.</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XInterfaceAttributeTypeDescription2:
XInterfaceAttributeTypeDescription
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XInterfaceTypeDescription2.idl Fri Jan 3 14:44:44 2014
@@ -35,7 +35,7 @@ interface XTypeDescription;
<p>This type supersedes <type>XInterfaceTypeDescription</type>, which only
supported single inheritance.</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XInterfaceTypeDescription2: XInterfaceTypeDescription {
/** Returns a sequence of all directly inherited (mandatory) base interface
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XModuleTypeDescription.idl Fri Jan 3 14:44:44 2014
@@ -39,7 +39,7 @@
<p>The type class of this type is
<member scope="com::sun::star::uno">TypeClass::MODULE</member>.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XModuleTypeDescription : com::sun::star::reflection::XTypeDescription
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XParameter.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XParameter.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XParameter.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XParameter.idl Fri Jan 3 14:44:44 2014
@@ -34,7 +34,7 @@ module com { module sun { module star
<p>This type supersedes <type>XMethodParameter</type>, which only supports
parameters of interface methods (which cannot have rest parameters).</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XParameter: XMethodParameter {
/**
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XPropertyTypeDescription.idl Fri Jan 3 14:44:44 2014
@@ -39,7 +39,7 @@
<p>The type class of this type is
<member scope="com::sun::star::uno">TypeClass::PROPERTY</member>.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XPropertyTypeDescription : com::sun::star::reflection::XTypeDescription
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XPublished.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XPublished.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XPublished.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XPublished.idl Fri Jan 3 14:44:44 2014
@@ -92,7 +92,7 @@ module com { module sun { module star
supported.</li>
</ul>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XPublished {
/**
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceConstructorDescription.idl Fri Jan 3 14:44:44 2014
@@ -34,7 +34,7 @@ interface XParameter;
/**
Reflects a service constructor.
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XServiceConstructorDescription {
/**
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceTypeDescription.idl Fri Jan 3 14:44:44 2014
@@ -49,7 +49,7 @@
<p>The type class of this type is
<member scope="com::sun::star::uno">TypeClass::SERVICE</member>.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XServiceTypeDescription : com::sun::star::reflection::XTypeDescription
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XServiceTypeDescription2.idl Fri Jan 3 14:44:44 2014
@@ -37,7 +37,7 @@ interface XTypeDescription;
<p>This type supersedes <type>XServiceTypeDescription</type>, which only
supports obsolete, accumulation-based services.</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XServiceTypeDescription2: XServiceTypeDescription {
/**
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XSingletonTypeDescription.idl Fri Jan 3 14:44:44 2014
@@ -47,7 +47,7 @@
<p>The type class of this type is
<member scope="com::sun::star::uno">TypeClass::SINGLETON</member>.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XSingletonTypeDescription : com::sun::star::reflection::XTypeDescription
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XSingletonTypeDescription2.idl Fri Jan 3 14:44:44 2014
@@ -36,7 +36,7 @@ interface XTypeDescription;
<p>This type supersedes <type>XSingletonTypeDescription</type>, which only
supports obsolete, service-based singletons.</p>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XSingletonTypeDescription2: XSingletonTypeDescription {
/**
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XStructTypeDescription.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XStructTypeDescription.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XStructTypeDescription.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XStructTypeDescription.idl Fri Jan 3 14:44:44 2014
@@ -62,7 +62,7 @@ interface XTypeDescription;
sequence.</li>
</ul>
- @since OOo 2.0
+ @since OpenOffice 2.0
*/
interface XStructTypeDescription: XCompoundTypeDescription {
/**
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XTypeDescriptionEnumeration.idl Fri Jan 3 14:44:44 2014
@@ -42,7 +42,7 @@
/** Defines an enumeration for type descriptions.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XTypeDescriptionEnumeration : com::sun::star::container::XEnumeration
{
Modified: openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl?rev=1555112&r1=1555111&r2=1555112&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl (original)
+++ openoffice/branches/rejuvenate01/main/udkapi/com/sun/star/reflection/XTypeDescriptionEnumerationAccess.idl Fri Jan 3 14:44:44 2014
@@ -51,7 +51,7 @@
/** Defines an interface for creating enumerations for type descriptions.
- @since OOo 1.1.2
+ @since OpenOffice 1.1.2
*/
published interface XTypeDescriptionEnumerationAccess : com::sun::star::uno::XInterface