You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by st...@apache.org on 2013/04/23 11:51:53 UTC
svn commit: r1470868 [12/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/automation/source/communi/ main/basctl/source/basicide/ ...
Modified: openoffice/branches/ia2/main/sc/source/ui/vba/vbacharts.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/vba/vbacharts.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/vba/vbacharts.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/vba/vbacharts.cxx Tue Apr 23 09:51:15 2013
@@ -75,7 +75,7 @@ ScVbaCharts::getCount() throw (uno::Runt
if ( xTableChartsSupplier.is() )
{
uno::Reference< table::XTableCharts > xTableCharts = xTableChartsSupplier->getCharts();
- ncount =+ xTableCharts->getElementNames().getLength();
+ ncount += xTableCharts->getElementNames().getLength();
}
}
}
Modified: openoffice/branches/ia2/main/sc/source/ui/vba/vbawindow.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/vba/vbawindow.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/vba/vbawindow.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/vba/vbawindow.cxx Tue Apr 23 09:51:15 2013
@@ -310,7 +310,7 @@ ScVbaWindow::ScrollWorkbookTabs( const u
uno::Any SAL_CALL
ScVbaWindow::getCaption() throw (uno::RuntimeException)
{
- static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - Apache OpenOffice Calc" ) );
+ static rtl::OUString sCrud(RTL_CONSTASCII_USTRINGPARAM(" - OpenOffice Calc" ) );
static sal_Int32 nCrudLen = sCrud.getLength();
rtl::OUString sTitle;
Modified: openoffice/branches/ia2/main/sc/source/ui/view/auditsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/auditsh.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/auditsh.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/auditsh.cxx Tue Apr 23 09:51:15 2013
@@ -34,6 +34,7 @@
#include <sfx2/objface.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/request.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#include "auditsh.hxx"
#include "tabvwsh.hxx"
@@ -72,6 +73,7 @@ ScAuditingShell::ScAuditingShell(ScViewD
}
SetHelpId( HID_SCSHELL_AUDIT );
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Auditing")));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Auditing));
}
//------------------------------------------------------------------------
@@ -147,5 +149,3 @@ void ScAuditingShell::GetState( SfxItemS
{
rSet.Put( SfxBoolItem( nFunction, sal_True ) ); // aktive Funktion markieren
}
-
-
Modified: openoffice/branches/ia2/main/sc/source/ui/view/cellsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/cellsh.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/cellsh.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/cellsh.cxx Tue Apr 23 09:51:15 2013
@@ -42,7 +42,9 @@
#include <sfx2/objface.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#include <svx/clipfmtitem.hxx>
+#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
#include <editeng/langitem.hxx>
#include "cellsh.hxx"
@@ -85,6 +87,7 @@ ScCellShell::ScCellShell(ScViewData* pDa
{
SetHelpId(HID_SCSHELL_CELLSH);
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Cell")));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Cell));
}
ScCellShell::~ScCellShell()
Modified: openoffice/branches/ia2/main/sc/source/ui/view/cellsh3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/cellsh3.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/cellsh3.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/cellsh3.cxx Tue Apr 23 09:51:15 2013
@@ -360,6 +360,14 @@ void ScCellShell::Execute( SfxRequest& r
pTabViewShell->ExecuteCellFormatDlg( rReq, TP_ALIGNMENT );
break;
+ case SID_CELL_FORMAT_BORDER:
+ pTabViewShell->ExecuteCellFormatDlg( rReq, TP_BORDER );
+ break;
+
+ case SID_CHAR_DLG_EFFECT:
+ pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONTEFF );
+ break;
+
case SID_OPENDLG_SOLVE:
{
sal_uInt16 nId = ScSolverDlgWrapper::GetChildWindowId();
Modified: openoffice/branches/ia2/main/sc/source/ui/view/drawview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/drawview.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/drawview.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/drawview.cxx Tue Apr 23 09:51:15 2013
@@ -225,6 +225,10 @@ void ScDrawView::InvalidateDrawTextAttrs
rBindings.Invalidate( SID_ULINE_VAL_DOTTED );
rBindings.Invalidate( SID_ATTR_CHAR_OVERLINE );
rBindings.Invalidate( SID_ATTR_CHAR_COLOR );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_LEFT );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_CENTER);
rBindings.Invalidate( SID_ALIGNLEFT );
rBindings.Invalidate( SID_ALIGNCENTERHOR );
rBindings.Invalidate( SID_ALIGNRIGHT );
@@ -234,6 +238,9 @@ void ScDrawView::InvalidateDrawTextAttrs
rBindings.Invalidate( SID_ATTR_PARA_LINESPACE_20 );
rBindings.Invalidate( SID_SET_SUPER_SCRIPT );
rBindings.Invalidate( SID_SET_SUB_SCRIPT );
+ rBindings.Invalidate( SID_ATTR_CHAR_KERNING );
+ rBindings.Invalidate( SID_ATTR_CHAR_STRIKEOUT );
+ rBindings.Invalidate( SID_ATTR_CHAR_SHADOWED );
rBindings.Invalidate( SID_TEXTDIRECTION_LEFT_TO_RIGHT );
rBindings.Invalidate( SID_TEXTDIRECTION_TOP_TO_BOTTOM );
rBindings.Invalidate( SID_ATTR_PARA_LEFT_TO_RIGHT );
Modified: openoffice/branches/ia2/main/sc/source/ui/view/editsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/editsh.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/editsh.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/editsh.cxx Tue Apr 23 09:51:15 2013
@@ -45,6 +45,7 @@
#include <editeng/flditem.hxx>
#include <editeng/fontitem.hxx>
#include <svx/hlnkitem.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#include <editeng/postitem.hxx>
#include <editeng/scripttypeitem.hxx>
#include <editeng/shdditem.hxx>
@@ -113,6 +114,7 @@ ScEditShell::ScEditShell(EditView* pView
SetPool( pEditView->GetEditEngine()->GetEmptyItemSet().GetPool() );
SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() );
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("EditCell")));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_EditCell));
}
ScEditShell::~ScEditShell()
@@ -331,6 +333,17 @@ void ScEditShell::Execute( SfxRequest& r
pTableView->SetSelection(ESelection(0,0,nPar-1,nLen));
if (pTopView)
pTopView->SetSelection(ESelection(0,0,nPar-1,nLen));
+ rBindings.Invalidate( SID_ATTR_CHAR_FONT );
+ rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT );
+ rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT );
+ rBindings.Invalidate( SID_ATTR_CHAR_POSTURE );
+ rBindings.Invalidate( SID_ATTR_CHAR_UNDERLINE );
+ rBindings.Invalidate( SID_ATTR_CHAR_STRIKEOUT );
+ rBindings.Invalidate( SID_ATTR_CHAR_SHADOWED );
+ rBindings.Invalidate( SID_ATTR_CHAR_KERNING );
+ rBindings.Invalidate( SID_ATTR_CHAR_COLOR );
+ rBindings.Invalidate( SID_SET_SUPER_SCRIPT );
+ rBindings.Invalidate( SID_SET_SUB_SCRIPT );
}
bSetModified = sal_False;
}
@@ -453,6 +466,7 @@ void ScEditShell::Execute( SfxRequest& r
}
break;
+ case SID_CHAR_DLG_EFFECT:
case SID_CHAR_DLG:
{
SfxItemSet aAttrs( pTableView->GetAttribs() );
@@ -466,6 +480,10 @@ void ScEditShell::Execute( SfxRequest& r
SfxAbstractTabDialog* pDlg = pFact->CreateScCharDlg( pViewData->GetDialogParent(), &aAttrs,
pObjSh, RID_SCDLG_CHAR );
DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001
+ if (nSlot == SID_CHAR_DLG_EFFECT)
+ {
+ pDlg->SetCurPageId(RID_SVXPAGE_CHAR_EFFECTS);
+ }
short nRet = pDlg->Execute();
// pDlg is needed below
@@ -988,6 +1006,15 @@ void ScEditShell::ExecuteAttr(SfxRequest
rBindings.Invalidate( nSlot );
}
break;
+ case SID_ATTR_CHAR_KERNING:
+ {
+ if(pArgs)
+ {
+ aSet.Put ( pArgs->Get(pArgs->GetPool()->GetWhich(nSlot)));
+ rBindings.Invalidate( nSlot );
+ }
+ }
+ break;
}
//
@@ -1074,6 +1101,27 @@ void ScEditShell::GetAttrState(SfxItemSe
ScInputHandler* pHdl = GetMyInputHdl();
if ( pHdl && pHdl->IsFormulaMode() )
rSet.ClearItem( EE_CHAR_WEIGHT ); // hervorgehobene Klammern hier nicht
+
+ SvxEscapement eEsc = (SvxEscapement) ( (const SvxEscapementItem&)
+ aAttribs.Get( EE_CHAR_ESCAPEMENT ) ).GetEnumValue();
+ if( eEsc == SVX_ESCAPEMENT_SUPERSCRIPT )
+ {
+ rSet.Put( SfxBoolItem( SID_SET_SUPER_SCRIPT, sal_True ) );
+ }
+ else if( eEsc == SVX_ESCAPEMENT_SUBSCRIPT )
+ {
+ rSet.Put( SfxBoolItem( SID_SET_SUB_SCRIPT, sal_True ) );
+ }
+ pViewData->GetBindings().Invalidate( SID_SET_SUPER_SCRIPT );
+ pViewData->GetBindings().Invalidate( SID_SET_SUB_SCRIPT );
+
+ eState = aAttribs.GetItemState( EE_CHAR_KERNING, sal_True );
+ pViewData->GetBindings().Invalidate( SID_ATTR_CHAR_KERNING );
+ if ( eState == SFX_ITEM_DONTCARE )
+ {
+ // rSet.InvalidateItem( SID_ATTR_CHAR_KERNING );
+ rSet.InvalidateItem(EE_CHAR_KERNING);
+ }
}
String ScEditShell::GetSelectionText( sal_Bool bWholeWord )
@@ -1202,4 +1250,3 @@ void ScEditShell::ExecuteTrans( SfxReque
pHdl->DataChanged();
}
}
-
Modified: openoffice/branches/ia2/main/sc/source/ui/view/formatsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/formatsh.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/formatsh.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/formatsh.cxx Tue Apr 23 09:51:15 2013
@@ -990,13 +990,97 @@ void ScFormatShell::ExecuteNumFormat( Sf
break;
case SID_NUMBER_FORMAT:
- if ( pReqArgs )
+ //if ( pReqArgs )
+ //{
+ // const SfxPoolItem* pItem;
+ // if(pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET)
+ // {
+ // String aCode = ((const SfxStringItem*)pItem)->GetValue();
+ // pTabViewShell->SetNumFmtByStr( aCode );
+ // }
+ //}
+
+ // symphony version with format interpretation
+ if(pReqArgs)
{
const SfxPoolItem* pItem;
- if(pReqArgs->GetItemState(nSlot, sal_True, &pItem) == SFX_ITEM_SET)
+ ScDocument* pDoc = pViewData->GetDocument();
+ SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+ LanguageType eLanguage = ScGlobal::eLnge;
+ sal_Int16 eType = -1;
+ sal_uInt32 nCurrentNumberFormat;
+
+ pDoc->GetNumberFormat(pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo(), nCurrentNumberFormat);
+ const SvNumberformat* pEntry = pFormatter->GetEntry(nCurrentNumberFormat);
+
+ if(pEntry)
+ {
+ eLanguage = pEntry->GetLanguage();
+ eType = pEntry->GetType();
+ }
+
+ //Just use eType to judge whether the command is fired for NUMBER/PERCENT/CURRENCY
+ //In sidebar, users can fire SID_NUMBER_FORMAT command by operating the related UI controls before they are disable
+ switch(eType)
+ {
+ case NUMBERFORMAT_ALL:
+ case NUMBERFORMAT_NUMBER:
+ case NUMBERFORMAT_NUMBER| NUMBERFORMAT_DEFINED:
+ case NUMBERFORMAT_PERCENT:
+ case NUMBERFORMAT_PERCENT| NUMBERFORMAT_DEFINED:
+ case NUMBERFORMAT_CURRENCY:
+ case NUMBERFORMAT_CURRENCY|NUMBERFORMAT_DEFINED:
+ eType = 0;
+ break;
+ default:
+ eType =-1;
+ }
+
+ if(SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, true, &pItem) && eType != -1)
{
String aCode = ((const SfxStringItem*)pItem)->GetValue();
- pTabViewShell->SetNumFmtByStr( aCode );
+ sal_uInt16 aLen = aCode.Len();
+ String* sFormat = new String[4];
+ String sTmpStr = String::CreateFromAscii("");
+ sal_uInt16 nCount(0);
+ sal_uInt16 nStrCount(0);
+
+ while(nCount < aLen)
+ {
+ sal_Unicode cChar = aCode.GetChar(nCount);
+
+ if(cChar == sal_Unicode(','))
+ {
+ sFormat[nStrCount] = sTmpStr;
+ sTmpStr = String::CreateFromAscii("");
+ nStrCount++;
+ }
+ else
+ {
+ sTmpStr += cChar;
+ }
+
+ nCount++;
+
+ if(nStrCount > 3)
+ break;
+ }
+
+ const sal_Bool bThousand = (sal_Bool)sFormat[0].ToInt32();
+ const sal_Bool bNegRed = (sal_Bool)sFormat[1].ToInt32();
+ const sal_uInt16 nPrecision = (sal_uInt16)sFormat[2].ToInt32();
+ const sal_uInt16 nLeadZeroes = (sal_uInt16)sFormat[3].ToInt32();
+
+ pFormatter->GenerateFormat(
+ aCode,
+ nCurrentNumberFormat,//modify
+ eLanguage,
+ bThousand,
+ bNegRed,
+ nPrecision,
+ nLeadZeroes);
+ pTabViewShell->SetNumFmtByStr(aCode);
+ delete[] sFormat;
}
}
break;
@@ -1020,7 +1104,54 @@ void ScFormatShell::ExecuteNumFormat( Sf
}
break;
- default:
+ case SID_NUMBER_TYPE_FORMAT:
+ if ( pReqArgs )
+ {
+ const SfxPoolItem* pItem;
+ if ( pReqArgs->GetItemState( nSlot, sal_True, &pItem ) == SFX_ITEM_SET )
+ {
+ sal_uInt16 nFormat = ((SfxInt16Item *)pItem)->GetValue();
+ switch(nFormat)
+ {
+ case 0:
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER); //Modify
+ break;
+ case 1:
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 2 ); //Modify
+ break;
+ case 2:
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_PERCENT );
+ break;
+ case 3:
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_CURRENCY );
+ break;
+ case 4:
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_DATE );
+ break;
+ case 5:
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_TIME );
+ break;
+ case 6:
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_SCIENTIFIC );
+ break;
+ case 7:
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_FRACTION );
+ break;
+ case 8:
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_LOGICAL );
+ break;
+ case 9:
+ pTabViewShell->SetNumberFormat( NUMBERFORMAT_TEXT );
+ break;
+ default:
+ ;
+ }
+ rReq.Done();
+ }
+ }
+ break;
+
+ default:
DBG_ERROR("falscher Slot bei ExecuteEdit");
break;
}
@@ -1109,7 +1240,10 @@ void ScFormatShell::ExecuteAlignment( Sf
}
}
}
-
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_LEFT );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_CENTER);
rBindings.Invalidate( SID_ALIGNLEFT );
rBindings.Invalidate( SID_ALIGNRIGHT );
rBindings.Invalidate( SID_ALIGNCENTERHOR );
@@ -1622,6 +1756,44 @@ void ScFormatShell::ExecuteAttr( SfxRequ
}
break;
+ case SID_ATTR_BORDER_DIAG_TLBR:
+ case SID_ATTR_BORDER_DIAG_BLTR:
+ {
+ // ScDocument* pDoc = GetViewData()->GetDocument();
+ const ScPatternAttr* pOldAttrs = pTabViewShell->GetSelectionPattern();
+ SfxItemSet* pOldSet = new SfxItemSet(pOldAttrs->GetItemSet());
+ SfxItemSet* pNewSet = new SfxItemSet(pOldAttrs->GetItemSet());
+ const SfxPoolItem* pItem = 0;
+
+ if(SID_ATTR_BORDER_DIAG_TLBR == nSlot)
+ {
+ if(SFX_ITEM_SET == pNewAttrs->GetItemState(ATTR_BORDER_TLBR, true, &pItem))
+ {
+ SvxLineItem aItem(ATTR_BORDER_TLBR);
+ aItem.SetLine(((const SvxLineItem&)pNewAttrs->Get(ATTR_BORDER_TLBR)).GetLine());
+ pNewSet->Put(aItem);
+ rReq.AppendItem(aItem);
+ pTabViewShell->ApplyAttributes(pNewSet, pOldSet);
+ }
+ }
+ else // if( nSlot == SID_ATTR_BORDER_DIAG_BLTR )
+ {
+ if(SFX_ITEM_SET == pNewAttrs->GetItemState(ATTR_BORDER_BLTR, true, &pItem ))
+ {
+ SvxLineItem aItem(ATTR_BORDER_BLTR);
+ aItem.SetLine(((const SvxLineItem&)pNewAttrs->Get(ATTR_BORDER_BLTR)).GetLine());
+ pNewSet->Put(aItem);
+ rReq.AppendItem(aItem);
+ pTabViewShell->ApplyAttributes(pNewSet, pOldSet);
+ }
+ }
+
+ delete pOldSet;
+ delete pNewSet;
+ rBindings.Invalidate(nSlot);
+ }
+ break;
+
// ATTR_BACKGROUND (=SID_ATTR_BRUSH) muss ueber zwei IDs
// gesetzt werden:
case SID_BACKGROUND_COLOR:
@@ -1673,7 +1845,7 @@ void ScFormatShell::GetAttrState( SfxIte
{
ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
- const SvxBorderLine* pLine = pTabViewShell->GetDefaultFrameLine();
+ // const SvxBorderLine* pLine = pTabViewShell->GetDefaultFrameLine();
const SvxBrushItem& rBrushItem = (const SvxBrushItem&)rAttrSet.Get( ATTR_BACKGROUND );
SfxWhichIter aIter( rSet );
sal_uInt16 nWhich = aIter.FirstWhich();
@@ -1700,11 +1872,184 @@ void ScFormatShell::GetAttrState( SfxIte
case SID_BACKGROUND_COLOR:
{
rSet.Put( SvxColorItem( rBrushItem.GetColor(), SID_BACKGROUND_COLOR ) );
+
+ if(SFX_ITEM_DONTCARE == rAttrSet.GetItemState(ATTR_BACKGROUND))
+ {
+ rSet.InvalidateItem(SID_BACKGROUND_COLOR);
+ }
}
break;
+ case SID_FRAME_LINESTYLE:
case SID_FRAME_LINECOLOR:
{
- rSet.Put( SvxColorItem( pLine ? pLine->GetColor() : Color(), SID_FRAME_LINECOLOR ) );
+ // handled together because both need the cell border information for decisions
+ // rSet.Put( SvxColorItem( pLine ? pLine->GetColor() : Color(), SID_FRAME_LINECOLOR ) );
+ Color aCol = 0;
+ // sal_uInt16 nOut = 0, nIn = 0, nDis = 0;
+ SvxBorderLine aLine(0,0,0,0);
+ bool bCol = 0;
+ bool bColDisable = 0, bStyleDisable = 0;
+ SvxBoxItem aBoxItem(ATTR_BORDER);
+ SvxBoxInfoItem aInfoItem(ATTR_BORDER_INNER);
+
+ pTabViewShell->GetSelectionFrame(aBoxItem, aInfoItem);
+
+ if( aBoxItem.GetTop() )
+ {
+ bCol = 1;
+ aCol = aBoxItem.GetTop()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aBoxItem.GetTop()->GetOutWidth());
+ aLine.SetInWidth( aBoxItem.GetTop()->GetInWidth());
+ aLine.SetDistance( aBoxItem.GetTop()->GetDistance());
+ }
+
+ if( aBoxItem.GetBottom() )
+ {
+ if(bCol == 0)
+ {
+ bCol = 1;
+ aCol = aBoxItem.GetBottom()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aBoxItem.GetBottom()->GetOutWidth());
+ aLine.SetInWidth( aBoxItem.GetBottom()->GetInWidth());
+ aLine.SetDistance( aBoxItem.GetBottom()->GetDistance());
+ }
+ else
+ {
+ if(aCol != aBoxItem.GetBottom()->GetColor() )
+ bColDisable = 1;
+ if(!( aLine == *(aBoxItem.GetBottom())) )
+ bStyleDisable = 1;
+ }
+ }
+
+ if( aBoxItem.GetLeft() )
+ {
+ if(bCol == 0)
+ {
+ bCol = 1;
+ aCol = aBoxItem.GetLeft()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aBoxItem.GetLeft()->GetOutWidth());
+ aLine.SetInWidth( aBoxItem.GetLeft()->GetInWidth());
+ aLine.SetDistance( aBoxItem.GetLeft()->GetDistance());
+ }
+ else
+ {
+ if(aCol != aBoxItem.GetLeft()->GetColor() )
+ bColDisable = 1;
+ if(!( aLine == *(aBoxItem.GetLeft())) )
+ bStyleDisable = 1;
+ }
+ }
+
+ if( aBoxItem.GetRight() )
+ {
+ if(bCol == 0)
+ {
+ bCol = 1;
+ aCol = aBoxItem.GetRight()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aBoxItem.GetRight()->GetOutWidth());
+ aLine.SetInWidth( aBoxItem.GetRight()->GetInWidth());
+ aLine.SetDistance( aBoxItem.GetRight()->GetDistance());
+ }
+ else
+ {
+ if(aCol != aBoxItem.GetRight()->GetColor() )
+ bColDisable = 1;
+ if(!( aLine == *(aBoxItem.GetRight())) )
+ bStyleDisable = 1;
+ }
+ }
+
+ if( aInfoItem.GetVert())
+ {
+ if(bCol == 0)
+ {
+ bCol = 1;
+ aCol = aInfoItem.GetVert()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aInfoItem.GetVert()->GetOutWidth());
+ aLine.SetInWidth( aInfoItem.GetVert()->GetInWidth());
+ aLine.SetDistance( aInfoItem.GetVert()->GetDistance());
+ }
+ else
+ {
+ if(aCol != aInfoItem.GetVert()->GetColor() )
+ bColDisable = 1;
+ if(!( aLine == *(aInfoItem.GetVert())) )
+ bStyleDisable = 1;
+ }
+ }
+
+ if( aInfoItem.GetHori())
+ {
+ if(bCol == 0)
+ {
+ bCol = 1;
+ aCol = aInfoItem.GetHori()->GetColor() ;
+ aLine.SetColor(aCol);
+ aLine.SetOutWidth( aInfoItem.GetHori()->GetOutWidth());
+ aLine.SetInWidth( aInfoItem.GetHori()->GetInWidth());
+ aLine.SetDistance( aInfoItem.GetHori()->GetDistance());
+ }
+ else
+ {
+ if(aCol != aInfoItem.GetHori()->GetColor() )
+ bColDisable = 1;
+ if(!( aLine == *(aInfoItem.GetHori())) )
+ bStyleDisable = 1;
+ }
+ }
+
+ if( !aInfoItem.IsValid( VALID_VERT )
+ || !aInfoItem.IsValid( VALID_HORI )
+ || !aInfoItem.IsValid( VALID_LEFT )
+ || !aInfoItem.IsValid( VALID_RIGHT )
+ || !aInfoItem.IsValid( VALID_TOP )
+ || !aInfoItem.IsValid( VALID_BOTTOM ) )
+ {
+ bColDisable = 1;
+ bStyleDisable = 1;
+ }
+
+ if(SID_FRAME_LINECOLOR == nWhich)
+ {
+ if(bColDisable) // if different lines have differernt colors
+ {
+ aCol = COL_TRANSPARENT;
+ rSet.Put( SvxColorItem(aCol, SID_FRAME_LINECOLOR ) );
+ rSet.InvalidateItem(SID_FRAME_LINECOLOR);
+ }
+ else if( bCol == 0 && bColDisable == 0) // if no line available
+ {
+ aCol = COL_AUTO;
+ rSet.Put( SvxColorItem(aCol, SID_FRAME_LINECOLOR ) );
+ }
+ else
+ rSet.Put( SvxColorItem(aCol, SID_FRAME_LINECOLOR ) );
+ }
+ else // if( nWhich == SID_FRAME_LINESTYLE)
+ {
+ if(bStyleDisable) // if have several lines but don't have same style
+ {
+ aLine.SetOutWidth( 1 );
+ aLine.SetInWidth( 0 );
+ aLine.SetDistance( 0 );
+ SvxLineItem aItem(SID_FRAME_LINESTYLE);
+ aItem.SetLine(&aLine);
+ rSet.Put( aItem );
+ rSet.InvalidateItem(SID_FRAME_LINESTYLE);
+ }
+ else // all the lines have same style or no line availavle, use initial value (0,0,0,0)
+ {
+ SvxLineItem aItem(SID_FRAME_LINESTYLE);
+ aItem.SetLine(&aLine);
+ rSet.Put( aItem );
+ }
+ }
}
break;
case SID_ATTR_BRUSH:
@@ -1722,6 +2067,13 @@ void ScFormatShell::GetAttrState( SfxIte
}
nWhich = aIter.NextWhich();
}
+
+ if(nWhich)
+ {
+ // stuff for sidebar panels
+ Invalidate(SID_ATTR_ALIGN_DEGREES);
+ Invalidate(SID_ATTR_ALIGN_STACKED);
+ }
}
//------------------------------------------------------------------
@@ -1999,25 +2351,141 @@ void ScFormatShell::GetNumFormatState( S
switch ( nWhich )
{
case SID_NUMBER_FORMAT:
+ //{
+ // String aFormatCode; // bleibt leer, wenn dont-care
+ //
+ // const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
+ // if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) != SFX_ITEM_DONTCARE )
+ // {
+ // sal_uLong nNumberFormat = ((const SfxUInt32Item&)rAttrSet.Get(
+ // ATTR_VALUE_FORMAT )).GetValue();
+ //
+ // SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+ // const SvNumberformat* pFormatEntry = pFormatter->GetEntry( nNumberFormat );
+ // if ( pFormatEntry )
+ // aFormatCode = pFormatEntry->GetFormatstring();
+ // }
+ //
+ // rSet.Put( SfxStringItem( nWhich, aFormatCode ) );
+ //}
+
+ // symphony version with format interpretation
{
- String aFormatCode; // bleibt leer, wenn dont-care
+ const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
+
+ if(SFX_ITEM_DONTCARE != rAttrSet.GetItemState(ATTR_VALUE_FORMAT))
+ {
+ SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+ sal_uInt32 nNumberFormat = ((const SfxUInt32Item&)rAttrSet.Get(ATTR_VALUE_FORMAT)).GetValue();
+ sal_Bool bThousand(false);
+ sal_Bool bNegRed(false);
+ sal_uInt16 nPrecision(0);
+ sal_uInt16 nLeadZeroes(0);
+
+ pFormatter->GetFormatSpecialInfo(nNumberFormat,bThousand, bNegRed, nPrecision, nLeadZeroes);
+ String aFormat;
+ static String sBreak = String::CreateFromAscii(",");
+ const String sThousand = String::CreateFromInt32(bThousand);
+ const String sNegRed = String::CreateFromInt32(bNegRed);
+ const String sPrecision = String::CreateFromInt32(nPrecision);
+ const String sLeadZeroes = String::CreateFromInt32(nLeadZeroes);
+
+ aFormat += sThousand;
+ aFormat += sBreak;
+ aFormat += sNegRed;
+ aFormat += sBreak;
+ aFormat += sPrecision;
+ aFormat += sBreak;
+ aFormat += sLeadZeroes;
+ aFormat += sBreak;
- const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
- if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) != SFX_ITEM_DONTCARE )
+ rSet.Put(SfxStringItem(nWhich, aFormat));
+ }
+ else
{
- sal_uLong nNumberFormat = ((const SfxUInt32Item&)rAttrSet.Get(
- ATTR_VALUE_FORMAT )).GetValue();
+ rSet.InvalidateItem( nWhich );
+ }
+ }
+ break;
+ case SID_NUMBER_TYPE_FORMAT:
+ {
+ sal_Int16 aFormatCode = -1;
+ const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet();
+ if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) >= SFX_ITEM_AVAILABLE ) //Modify for more robust
+ {
SvNumberFormatter* pFormatter = pDoc->GetFormatTable();
+ sal_uInt32 nNumberFormat = pTabViewShell->GetSelectionPattern()->GetNumberFormat( pFormatter );
const SvNumberformat* pFormatEntry = pFormatter->GetEntry( nNumberFormat );
+ bool bStandard = false;
+
if ( pFormatEntry )
- aFormatCode = pFormatEntry->GetFormatstring();
- }
+ {
+ aFormatCode = pFormatEntry->GetType();
+ bStandard = pFormatEntry->IsStandard();
+ }
- rSet.Put( SfxStringItem( nWhich, aFormatCode ) );
+ switch(aFormatCode)
+ {
+ case NUMBERFORMAT_NUMBER:
+ case NUMBERFORMAT_NUMBER| NUMBERFORMAT_DEFINED:
+ //use format code and standard format code to judge whether it is General,
+ //if (nNumberFormat == nStandardNumberFormat)
+ if (bStandard)
+ aFormatCode = 0;
+ else
+ aFormatCode = 1;
+ break;
+ case NUMBERFORMAT_PERCENT:
+ case NUMBERFORMAT_PERCENT| NUMBERFORMAT_DEFINED:
+ aFormatCode = 2;
+ break;
+ case NUMBERFORMAT_CURRENCY:
+ case NUMBERFORMAT_CURRENCY| NUMBERFORMAT_DEFINED:
+ aFormatCode = 3;
+ break;
+ case NUMBERFORMAT_DATE:
+ case NUMBERFORMAT_DATE| NUMBERFORMAT_DEFINED:
+ //Add
+ case NUMBERFORMAT_DATETIME:
+ case NUMBERFORMAT_DATETIME | NUMBERFORMAT_DEFINED:
+ aFormatCode = 4;
+ break;
+ case NUMBERFORMAT_TIME:
+ case NUMBERFORMAT_TIME| NUMBERFORMAT_DEFINED:
+ aFormatCode = 5;
+ break;
+ case NUMBERFORMAT_SCIENTIFIC:
+ case NUMBERFORMAT_SCIENTIFIC| NUMBERFORMAT_DEFINED:
+ aFormatCode = 6;
+ break;
+ case NUMBERFORMAT_FRACTION:
+ case NUMBERFORMAT_FRACTION| NUMBERFORMAT_DEFINED:
+ aFormatCode = 7;
+ break;
+ case NUMBERFORMAT_LOGICAL:
+ case NUMBERFORMAT_LOGICAL| NUMBERFORMAT_DEFINED:
+ aFormatCode = 8;
+ break;
+ case NUMBERFORMAT_TEXT:
+ case NUMBERFORMAT_TEXT| NUMBERFORMAT_DEFINED:
+ aFormatCode = 9;
+ break;
+ default:
+ aFormatCode = -1; //for more roburst
+ }
+ if( aFormatCode == -1 )
+ rSet.InvalidateItem( nWhich );
+ else
+ rSet.Put( SfxInt16Item( nWhich, aFormatCode ) );
+ }
+ else
+ {
+ rSet.InvalidateItem( nWhich );
+ }
+
}
break;
-
}
nWhich = aIter.NextWhich();
}
@@ -2168,3 +2636,52 @@ void ScFormatShell::StateFormatPaintbrus
rSet.Put( SfxBoolItem( SID_FORMATPAINTBRUSH, pViewData->GetView()->HasPaintBrush() ) );
}
+void ScFormatShell::ExecViewOptions( SfxRequest& rReq )
+{
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ SfxBindings& rBindings = pViewData->GetBindings();
+ const SfxItemSet* pNewAttrs = rReq.GetArgs();
+
+ if ( pNewAttrs )
+ {
+ sal_uInt16 nSlot = rReq.GetSlot();
+
+ if( nSlot == SID_SCGRIDSHOW)
+ {
+
+ ScViewData* pViewData = pTabViewShell->GetViewData();
+ const ScViewOptions& rOldOpt = pViewData->GetOptions();
+ ScDocShell* pDocSh = PTR_CAST(ScDocShell, SfxObjectShell::Current());
+ bool bState = ((const SfxBoolItem &)pNewAttrs->Get( pNewAttrs->GetPool()->GetWhich( nSlot ) )).GetValue();
+
+ if ( (bool)rOldOpt.GetOption( VOPT_GRID ) != bState)
+ {
+ ScViewOptions rNewOpt(rOldOpt);
+ rNewOpt.SetOption( VOPT_GRID, bState);
+ pViewData->SetOptions( rNewOpt );
+ pViewData->GetDocument()->SetViewOptions( rNewOpt );
+ pDocSh->SetDocumentModified();
+ //add , write the change to sc view config
+ ScModule* pScMod = SC_MOD();
+ pScMod->SetViewOptions( rNewOpt );
+ //add end
+ rBindings.Invalidate( nSlot );
+ }
+ }
+ }
+
+}
+
+void ScFormatShell::GetViewOptions( SfxItemSet& rSet )
+{
+ ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell();
+ if( pTabViewShell )
+ {
+ ScViewOptions aViewOpt = pTabViewShell->GetViewData()->GetOptions();
+ rSet.ClearItem(SID_SCGRIDSHOW);
+ SfxBoolItem aItem( SID_SCGRIDSHOW, aViewOpt.GetOption( VOPT_GRID ) );
+ rSet.Put(aItem);
+ }
+}
+
+// eof
Modified: openoffice/branches/ia2/main/sc/source/ui/view/gridwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/gridwin.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/gridwin.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/gridwin.cxx Tue Apr 23 09:51:15 2013
@@ -1903,7 +1903,20 @@ void __EXPORT ScGridWindow::MouseButtonU
}
if (DrawMouseButtonUp(rMEvt)) // includes format paint brush handling for drawing objects
- return;
+ {
+ ScTabViewShell* pViewShell = pViewData->GetViewShell();
+ SfxBindings& rBindings=pViewShell->GetViewFrame()->GetBindings();
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_WIDTH);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_HEIGHT);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_X);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_Y);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ANGLE);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_X);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_ROT_Y);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOWIDTH);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_AUTOHEIGHT);
+ return;
+ }
rMark.SetMarking(sal_False);
@@ -3077,8 +3090,21 @@ void __EXPORT ScGridWindow::KeyInput(con
if (pViewData->GetDocShell()->GetProgress())
return;
- if (DrawKeyInput(rKEvt))
+ if (DrawKeyInput(rKEvt))
+ {
+ const KeyCode& rKeyCode = rKEvt.GetKeyCode();
+ if (rKeyCode.GetCode() == KEY_DOWN
+ || rKeyCode.GetCode() == KEY_UP
+ || rKeyCode.GetCode() == KEY_LEFT
+ || rKeyCode.GetCode() == KEY_RIGHT)
+ {
+ ScTabViewShell* pViewShell = pViewData->GetViewShell();
+ SfxBindings& rBindings = pViewShell->GetViewFrame()->GetBindings();
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_X);
+ rBindings.Invalidate(SID_ATTR_TRANSFORM_POS_Y);
+ }
return;
+ }
if (!pViewData->GetView()->IsDrawSelMode() && !DrawHasMarkedObj()) // keine Eingaben im Zeichenmodus
{ //! DrawShell abfragen !!!
Modified: openoffice/branches/ia2/main/sc/source/ui/view/pivotsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/pivotsh.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/pivotsh.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/pivotsh.cxx Tue Apr 23 09:51:15 2013
@@ -36,6 +36,7 @@
#include <sfx2/request.hxx>
#include <svl/whiter.hxx>
#include <vcl/msgbox.hxx>
+#include <sfx2/sidebar/EnumContext.hxx>
#include "sc.hrc"
#include "pivotsh.hxx"
@@ -80,6 +81,7 @@ ScPivotShell::ScPivotShell( ScTabViewShe
}
SetHelpId( HID_SCSHELL_PIVOTSH );
SetName(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Pivot")));
+ SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Pivot));
}
//------------------------------------------------------------------------
@@ -197,4 +199,3 @@ ScDPObject* ScPivotShell::GetCurrDPObjec
return rViewData.GetDocument()->GetDPAtCursor(
rViewData.GetCurX(), rViewData.GetCurY(), rViewData.GetTabNo() );
}
-
Modified: openoffice/branches/ia2/main/sc/source/ui/view/tabview3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/tabview3.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/tabview3.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/tabview3.cxx Tue Apr 23 09:51:15 2013
@@ -230,6 +230,18 @@ void ScTabView::InvalidateAttribs()
rBindings.Invalidate( SID_ATTR_CHAR_OVERLINE );
+ rBindings.Invalidate( SID_ATTR_CHAR_KERNING );
+ rBindings.Invalidate( SID_SET_SUPER_SCRIPT );
+ rBindings.Invalidate( SID_SET_SUB_SCRIPT );
+ rBindings.Invalidate( SID_ATTR_CHAR_STRIKEOUT );
+ rBindings.Invalidate( SID_ATTR_CHAR_SHADOWED );
+
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_LEFT );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_RIGHT );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_BLOCK );
+ rBindings.Invalidate( SID_ATTR_PARA_ADJUST_CENTER);
+ rBindings.Invalidate( SID_NUMBER_TYPE_FORMAT);
+
rBindings.Invalidate( SID_ALIGNLEFT );
rBindings.Invalidate( SID_ALIGNRIGHT );
rBindings.Invalidate( SID_ALIGNBLOCK );
@@ -239,7 +251,22 @@ void ScTabView::InvalidateAttribs()
rBindings.Invalidate( SID_ALIGNBOTTOM );
rBindings.Invalidate( SID_ALIGNCENTERVER );
- rBindings.Invalidate( SID_BACKGROUND_COLOR );
+ // stuff for sidebar panels
+ {
+ rBindings.Invalidate( SID_H_ALIGNCELL );
+ rBindings.Invalidate( SID_V_ALIGNCELL );
+ rBindings.Invalidate( SID_ATTR_ALIGN_INDENT );
+ rBindings.Invalidate( SID_FRAME_LINECOLOR );
+ rBindings.Invalidate( SID_FRAME_LINESTYLE );
+ rBindings.Invalidate( SID_ATTR_BORDER_OUTER );
+ rBindings.Invalidate( SID_ATTR_BORDER_INNER );
+ rBindings.Invalidate( SID_SCGRIDSHOW );
+ rBindings.Invalidate( SID_ATTR_BORDER_DIAG_TLBR );
+ rBindings.Invalidate( SID_ATTR_BORDER_DIAG_BLTR );
+ rBindings.Invalidate( SID_NUMBER_TYPE_FORMAT );
+ }
+
+ rBindings.Invalidate( SID_BACKGROUND_COLOR );
rBindings.Invalidate( SID_ATTR_ALIGN_LINEBREAK );
rBindings.Invalidate( SID_NUMBER_FORMAT );
Modified: openoffice/branches/ia2/main/sc/source/ui/view/tabvwsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/tabvwsh.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/tabvwsh.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/tabvwsh.cxx Tue Apr 23 09:51:15 2013
@@ -38,6 +38,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/app.hxx>
+#include <sfx2/sidebar/SidebarChildWindow.hxx>
#include <avmedia/mediaplayer.hxx>
#include "tabvwsh.hxx"
@@ -65,6 +66,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxVie
SFX_CHILDWINDOW_REGISTRATION(SfxTemplateDialogWrapper::GetChildWindowId());
SFX_CHILDWINDOW_CONTEXT_REGISTRATION(SID_NAVIGATOR);
SFX_CHILDWINDOW_REGISTRATION(SID_TASKPANE);
+ SFX_CHILDWINDOW_REGISTRATION(::sfx2::sidebar::SidebarChildWindow::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScNameDlgWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScSolverDlgWrapper::GetChildWindowId());
SFX_CHILDWINDOW_REGISTRATION(ScOptSolverDlgWrapper::GetChildWindowId());
Modified: openoffice/branches/ia2/main/sc/source/ui/view/tabvwsh4.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/tabvwsh4.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/tabvwsh4.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/tabvwsh4.cxx Tue Apr 23 09:51:15 2013
@@ -39,6 +39,7 @@
#include <editeng/sizeitem.hxx>
#include <editeng/boxitem.hxx>
#include <svx/prtqry.hxx>
+#include <svx/sidebar/ContextChangeEventMultiplexer.hxx>
#include <sfx2/request.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/dispatch.hxx>
@@ -220,6 +221,10 @@ void __EXPORT ScTabViewShell::Activate(s
// Wenn Referenzeingabe-Tip-Hilfe hier wieder angezeigt werden soll (ShowRefTip),
// muss sie beim Verschieben der View angepasst werden (gibt sonst Probleme unter OS/2
// beim Umschalten zwischen Dokumenten)
+
+ ContextChangeEventMultiplexer::NotifyContextChange(
+ GetController(),
+ ::sfx2::sidebar::EnumContext::Context_Default);
}
void __EXPORT ScTabViewShell::Deactivate(sal_Bool bMDI)
Modified: openoffice/branches/ia2/main/sc/source/ui/view/viewfunc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/source/ui/view/viewfunc.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/source/ui/view/viewfunc.cxx (original)
+++ openoffice/branches/ia2/main/sc/source/ui/view/viewfunc.cxx Tue Apr 23 09:51:15 2013
@@ -2868,6 +2868,11 @@ void ScViewFunc::ChangeIndent( sal_Bool
{
pDocSh->UpdateOle(pViewData);
StartFormatArea();
+
+ // stuff for sidebar panels
+ SfxBindings& rBindings = GetViewData()->GetBindings();
+ rBindings.Invalidate( SID_H_ALIGNCELL );
+ rBindings.Invalidate( SID_ATTR_ALIGN_INDENT );
}
}
Modified: openoffice/branches/ia2/main/sc/uiconfig/scalc/menubar/menubar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/uiconfig/scalc/menubar/menubar.xml?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/uiconfig/scalc/menubar/menubar.xml (original)
+++ openoffice/branches/ia2/main/sc/uiconfig/scalc/menubar/menubar.xml Tue Apr 23 09:51:15 2013
@@ -144,6 +144,7 @@
<menu:menuitem menu:id=".uno:ViewDataSourceBrowser"/>
<menu:menuitem menu:id=".uno:Navigator"/>
<menu:menuitem menu:id=".uno:TaskPane"/>
+ <menu:menuitem menu:id=".uno:Sidebar"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
<menu:menuitem menu:id=".uno:Zoom"/>
Modified: openoffice/branches/ia2/main/sc/util/hidother.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/util/hidother.src?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/util/hidother.src (original)
+++ openoffice/branches/ia2/main/sc/util/hidother.src Tue Apr 23 09:51:15 2013
@@ -191,6 +191,10 @@ hidspecial HID_FUNC_SINHYP { HelpID =
hidspecial HID_FUNC_COTHYP { HelpID = HID_FUNC_COTHYP; };
hidspecial HID_FUNC_TANHYP { HelpID = HID_FUNC_TANHYP; };
hidspecial HID_FUNC_ARCTAN2 { HelpID = HID_FUNC_ARCTAN2; };
+hidspecial HID_FUNC_COSECANT { HelpID = HID_FUNC_COSECANT; };
+hidspecial HID_FUNC_SECANT { HelpID = HID_FUNC_SECANT; };
+hidspecial HID_FUNC_COSECANTHYP { HelpID = HID_FUNC_COSECANTHYP; };
+hidspecial HID_FUNC_SECANTHYP { HelpID = HID_FUNC_SECANTHYP; };
hidspecial HID_FUNC_DEG { HelpID = HID_FUNC_DEG; };
hidspecial HID_FUNC_RAD { HelpID = HID_FUNC_RAD; };
hidspecial HID_FUNC_EXP { HelpID = HID_FUNC_EXP; };
Modified: openoffice/branches/ia2/main/sc/util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/util/makefile.mk?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/util/makefile.mk (original)
+++ openoffice/branches/ia2/main/sc/util/makefile.mk Tue Apr 23 09:51:15 2013
@@ -41,6 +41,7 @@ RESLIB1LIST=\
$(SRS)$/ui.srs \
$(SRS)$/dbgui.srs \
$(SRS)$/drawfunc.srs \
+ $(SRS)$/sidebar.srs \
$(SRS)$/core.srs \
$(SRS)$/styleui.srs \
$(SRS)$/formdlgs.srs \
@@ -125,6 +126,7 @@ LIB3FILES= \
$(SLB)$/dbgui.lib \
$(SLB)$/pagedlg.lib \
$(SLB)$/drawfunc.lib \
+ $(SLB)$/sidebar.lib \
$(SLB)$/navipi.lib
LIB3FILES+= \
Modified: openoffice/branches/ia2/main/sc/util/sc.component
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sc/util/sc.component?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sc/util/sc.component (original)
+++ openoffice/branches/ia2/main/sc/util/sc.component Tue Apr 23 09:51:15 2013
@@ -90,4 +90,7 @@
<implementation name="stardiv.StarCalc.ScSpreadsheetSettings">
<service name="com.sun.star.sheet.GlobalSheetSettings"/>
</implementation>
+ <implementation name="org.apache.openoffice.comp.sc.sidebar.ScPanelFactory">
+ <service name="com.sun.star.ui.UIElementFactory"/>
+ </implementation>
</component>
Modified: openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.cxx?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.cxx (original)
+++ openoffice/branches/ia2/main/scaddins/source/analysis/analysishelper.cxx Tue Apr 23 09:51:15 2013
@@ -2223,8 +2223,8 @@ void Complex::Sech(void) THROWDEF_RTE_IA
THROW_IAE;
double fScale =1.0 / ( cosh( 2.0 * r ) + cos( 2.0 * i ));
double r_;
- r_ = 2.0 * cosh( 2.0 * r ) * cos( i ) * fScale;
- i = - (2.0 * sinh( 2.0 * r ) * sin( i ) * fScale );
+ r_ = 2.0 * cosh( r ) * cos( i ) * fScale;
+ i = - (2.0 * sinh( r ) * sin( i ) * fScale );
r = r_ ;
}
else
@@ -2246,8 +2246,8 @@ void Complex::Csch(void) THROWDEF_RTE_IA
THROW_IAE;
double fScale =1.0 / ( cosh( 2.0 * r ) - cos( 2.0 * i ));
double r_;
- r_ = 2.0 * sinh( 2.0 * r ) * cos( i ) * fScale;
- i = - ( 2.0 * cosh( 2.0 * r ) * sin( i ) * fScale );
+ r_ = 2.0 * sinh( r ) * cos( i ) * fScale;
+ i = - ( 2.0 * cosh( r ) * sin( i ) * fScale );
r = r_ ;
}
else
Modified: openoffice/branches/ia2/main/scp2/inc/macros.inc
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/inc/macros.inc?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/inc/macros.inc (original)
+++ openoffice/branches/ia2/main/scp2/inc/macros.inc Tue Apr 23 09:51:15 2013
@@ -386,7 +386,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
- Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Name = STRING(CONCAT2(OpenOffice.,name)); \
Value = " "; \
End
@@ -395,7 +395,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
Subkey = STRING(CONCAT3(.,key,\OpenWithProgIDs)); \
- Name = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Name = STRING(CONCAT2(OpenOffice.,name)); \
Value = " "; \
End
@@ -404,7 +404,7 @@ End
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = gid_Module_Root_Reg_##name; \
Subkey = STRING(CONCAT2(.,key)); \
- Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Value = STRING(CONCAT2(OpenOffice.,name)); \
ComponentCondition = STRING(CONCAT3(REGISTER_,cond,=1)); \
End
@@ -412,7 +412,7 @@ End
RegistryItem CONCAT2(gid_Regitem_Openoffice_,name) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Subkey = STRING(CONCAT2(OpenOffice.,name)); \
REG_VALUE_LNG(disp_name) \
End
@@ -420,7 +420,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Defaulticon) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\DefaultIcon)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\DefaultIcon)); \
Value = "<progpath>\program\soffice.exe," STRING(icon_id); \
End
@@ -428,7 +428,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell)); \
Value = STRING(default); \
End
@@ -436,13 +436,13 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\new)); \
REG_VALUE_LNG(NEW) \
End \
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_New_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\new\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\new\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -n \"%1\""; \
End
@@ -450,7 +450,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Open_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\open\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\open\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -o \"%1\""; \
End
@@ -458,7 +458,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Print_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\print\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\print\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -p \"%1\""; \
End
@@ -466,7 +466,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_Shell_Printto_Command) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- Subkey = STRING(CONCAT3(Apache OpenOffice.,name,\shell\printto\command)); \
+ Subkey = STRING(CONCAT3(OpenOffice.,name,\shell\printto\command)); \
Value = "\"<progpath>\program\\" STRING(app) "\" -pt \"%2\" \"%1\""; \
End
@@ -476,7 +476,7 @@ End
ModuleID = modid; \
Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
Name = STRING(CONCAT2(.,key)); \
- Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Value = STRING(CONCAT2(OpenOffice.,name)); \
Styles = (); \
End
@@ -486,7 +486,7 @@ End
ModuleID = modid; \
Subkey = STRING(Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\Capabilities\FileAssociations); \
Name = STRING(CONCAT2(.,key)); \
- Value = STRING(CONCAT2(Apache OpenOffice.,name)); \
+ Value = STRING(CONCAT2(OpenOffice.,name)); \
Styles = (); \
End
Modified: openoffice/branches/ia2/main/scp2/prj/build.lst
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/prj/build.lst?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/prj/build.lst (original)
+++ openoffice/branches/ia2/main/scp2/prj/build.lst Tue Apr 23 09:51:15 2013
@@ -3,7 +3,6 @@ cp scp2 usr1
cp scp2\macros nmake - all cp_langmacros NULL
cp scp2\source\templates nmake - all cp_langtemplates NULL
cp scp2\source\activex nmake - all cp_activex cp_langmacros cp_langtemplates NULL
-cp scp2\source\binfilter nmake - all cp_binfilter cp_langmacros cp_langtemplates NULL
cp scp2\source\calc nmake - all cp_calc cp_langmacros cp_langtemplates NULL
cp scp2\source\canvas nmake - all cp_canvas cp_langmacros cp_langtemplates NULL
cp scp2\source\crashrep nmake - all cp_crashrep cp_langmacros cp_langtemplates NULL
@@ -24,4 +23,4 @@ cp scp2\source\base nmake
cp scp2\source\xsltfilter nmake - all cp_xsltfilter cp_langmacros cp_langtemplates NULL
cp scp2\source\winexplorerext nmake - all cp_winexplorerext cp_langmacros cp_langtemplates NULL
cp scp2\source\onlineupdate nmake - all cp_update cp_langmacros cp_langtemplates NULL
-cp scp2\util nmake - all cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
+cp scp2\util nmake - all cp_util cp_activex cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_math cp_ooo cp_python cp_quickstart cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
Modified: openoffice/branches/ia2/main/scp2/source/math/registryitem_math.ulf
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/math/registryitem_math.ulf?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/math/registryitem_math.ulf (original)
+++ openoffice/branches/ia2/main/scp2/source/math/registryitem_math.ulf Tue Apr 23 09:51:15 2013
@@ -29,4 +29,3 @@ en-US = "%SXWFORMATNAME %SXWFORMATVERSIO
[STR_REG_VAL_OO_FORMULA]
en-US = "OpenDocument Formula"
-de = "OpenDocument Formel"
Modified: openoffice/branches/ia2/main/scp2/source/ooo/common_brand.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/common_brand.scp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/common_brand.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/common_brand.scp Tue Apr 23 09:51:15 2013
@@ -43,8 +43,8 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_Uno_Packages_Cache,
gid_Brand_Dir_Share_Registry,
gid_Brand_Dir_Share_Xdg);
- Files = (gid_Brand_File_BasisLink,
- gid_Brand_File_Bin_Crashreport,
+ // Files = (gid_Brand_File_BasisLink,
+ Files = (gid_Brand_File_Bin_Crashreport,
gid_Brand_File_Bin_Crashreport_Script,
gid_Brand_File_Bin_Crashreport_Com,
gid_Brand_File_Bin_Python,
@@ -73,8 +73,8 @@ Module gid_Module_Root_Brand
gid_Brand_File_Lib_Oirm2,
gid_Brand_File_Msvcm80crt_Manifest,
gid_Brand_File_Lib_Npsoplugin,
- gid_Brand_File_ServicesRdb,
- gid_Brand_File_Share_Registry_Brand_Xcd,
+// gid_Brand_File_ServicesRdb,
+// gid_Brand_File_Share_Registry_Brand_Xcd,
gid_Brand_File_Share_Registry_O5oo_Xcd,
gid_Brand_File_Script_Unopkg,
gid_Brand_File_Share_Xdg_Base,
@@ -89,10 +89,12 @@ Module gid_Module_Root_Brand
gid_Brand_File_Share_Xdg_StartCenter,
gid_Brand_File_Share_Xdg_Writer,
gid_Brand_File_Txt_Package);
- Unixlinks = (gid_Brand_Unixlink_BasisLink,
- gid_Brand_Unixlink_Program,
- gid_Brand_Unixlink_Unopkg,
- gid_Brand_Unixlink_Urelibs);
+ Unixlinks = (gid_Brand_Unixlink_Program,
+ gid_Brand_Unixlink_Unopkg);
+// Unixlinks = (gid_Brand_Unixlink_BasisLink,
+// gid_Brand_Unixlink_Program,
+// gid_Brand_Unixlink_Unopkg,
+// gid_Brand_Unixlink_Urelibs);
End
// Language specific brand module
@@ -139,7 +141,7 @@ End
Directory gid_Brand_Dir_Readme
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Brand_Root;
#endif
@@ -148,7 +150,7 @@ End
Directory gid_Brand_Dir_License
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Brand_Root;
#endif
@@ -246,28 +248,29 @@ End
// Link to basis
-#if defined(WNT) || defined(OS2)
-File gid_Brand_File_BasisLink
- TXT_FILE_BODY;
- Dir = gid_Dir_Brand_Root;
- Name = "basis-link";
- Styles = (PACKED);
-End
-#elif defined MACOSX
-Directory gid_Brand_Dir_BasisLink
- ParentID = gid_Dir_Bundle_Contents;
- DosName = "basis-link";
-End
-#else
-Unixlink gid_Brand_Unixlink_BasisLink
- BIN_FILE_BODY;
- Styles = ();
- // Styles = (LAYERLINK);
- Name = "basis-link";
- Dir = gid_Dir_Brand_Root;
- Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
-End
-#endif
+//#if defined(WNT) || defined(OS2)
+//File gid_Brand_File_BasisLink
+// TXT_FILE_BODY;
+// Dir = gid_Dir_Brand_Root;
+// Name = "basis-link";
+// Styles = (PACKED);
+//End
+//#elif defined MACOSX
+//Directory gid_Brand_Dir_BasisLink
+// ParentID = gid_Dir_Bundle_Contents;
+// DosName = "";
+//// DosName = "basis-link";
+//End
+//#else
+//Unixlink gid_Brand_Unixlink_BasisLink
+// BIN_FILE_BODY;
+// Styles = ();
+// // Styles = (LAYERLINK);
+// Name = "basis-link";
+// Dir = gid_Dir_Brand_Root;
+// Target = "../${UNIXBASISROOTNAME}/basis${OOOBASEVERSION}";
+//End
+//#endif
// UnixLinks
@@ -473,12 +476,12 @@ File gid_Brand_File_Txt_Package
Styles = (PACKED);
End
-File gid_Brand_File_Share_Registry_Brand_Xcd
- TXT_FILE_BODY;
- Styles = (PACKED, SCPZIP_REPLACE);
- Dir = gid_Brand_Dir_Share_Registry;
- Name = "brand.xcd";
-End
+#File gid_Brand_File_Share_Registry_Brand_Xcd
+# TXT_FILE_BODY;
+# Styles = (PACKED, SCPZIP_REPLACE);
+# Dir = gid_Brand_Dir_Share_Registry;
+# Name = "brand.xcd";
+#End
File gid_Brand_File_Share_Registry_Cjk_Xcd
TXT_FILE_BODY;
@@ -723,11 +726,13 @@ Profile gid_Brand_Profile_Version_Ini
Styles = (NETWORK);
End
+#ifdef JSC
Profile gid_Brand_Profile_Fundamental_Ini
ModuleID = gid_Module_Root_Brand;
Name = PROFILENAME(fundamental);
Dir = gid_Brand_Dir_Program;
End
+#endif
#if !defined MACOSX
Profile gid_Brand_Profile_Redirect_Ini
@@ -1025,6 +1030,15 @@ ProfileItem gid_Brand_Profileitem_Versio
Value = "${OOOBASEVERSION}";
End
+ProfileItem gid_Brand_Profileitem_Version_Ooopackageversion
+ ProfileID = gid_Brand_Profile_Version_Ini;
+ ModuleID = gid_Module_Root_Brand;
+ Section = "Version";
+ Order = 18;
+ Key = "OOOPackageVersion";
+ Value = "${OOOPACKAGEVERSION}";
+End
+
ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
@@ -1034,6 +1048,8 @@ ProfileItem gid_Brand_Profileitem_Versio
Value = "http://updateexte.services.openoffice.org/ExtensionUpdateService/check.Update";
End
+#ifdef JSC
+
ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1048,9 +1064,11 @@ ProfileItem gid_Brand_Profileitem_Fundam
Section = "Bootstrap";
Key = "OOO_BASE_DIR";
#if defined(WNT) || defined(OS2)
- Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
+ Value = "${BRAND_BASE_DIR}";
+// Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
#else
- Value = "${BRAND_BASE_DIR}/basis-link";
+ Value = "${BRAND_BASE_DIR}";
+// Value = "${BRAND_BASE_DIR}/basis-link";
#endif
End
@@ -1182,6 +1200,8 @@ ProfileItem gid_Brand_Profileitem_Fundam
Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_LIB_DIR}";
End
+#endif # JSC
+
#if !defined MACOSX
ProfileItem gid_Brand_Profileitem_Redirect_Ure_Bootstrap
ModuleID = gid_Module_Root_Brand;
Modified: openoffice/branches/ia2/main/scp2/source/ooo/directory_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/directory_ooo.scp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/directory_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/directory_ooo.scp Tue Apr 23 09:51:15 2013
@@ -69,36 +69,47 @@ End
Directory gid_Dir_Ooo_Openofficeorg
ParentID = PREDEFINED_PROGDIR;
#if defined(WNT) || defined(OS2)
- HostName = "${BASISROOTNAME}";
+ HostName = "${PRODUCTNAME} ${BRANDPACKAGEVERSION}";
#else
- HostName = "${UNIXBASISROOTNAME}";
+ HostName = "${UNIXPRODUCTNAME}${BRANDPACKAGEVERSION}";
#endif
+// ParentID = PREDEFINED_PROGDIR;
+// #if defined(WNT) || defined(OS2)
+// HostName = "${BASISROOTNAME}";
+// #else
+// HostName = "${UNIXBASISROOTNAME}";
+// #endif
End
#endif
#ifndef MACOSX
Directory gid_Dir_Ooo_Basis
- #if defined(WNT) || defined(OS2)
- ParentID = gid_Dir_Brand_Root;
- #else
ParentID = gid_Dir_Ooo_Openofficeorg;
- #endif
- #if defined(WNT) || defined(OS2)
- HostName = "Basis";
- #else
- HostName = "basis${OOOBASEVERSION}";
- #endif
+ HostName = "";
Styles = (BASISDIRECTORY);
+// #if defined(WNT) || defined(OS2)
+// ParentID = gid_Dir_Brand_Root;
+// #else
+// ParentID = gid_Dir_Ooo_Openofficeorg;
+// #endif
+// #if defined(WNT) || defined(OS2)
+// HostName = "";
+// #else
+// HostName = "basis${OOOBASEVERSION}";
+// #endif
+// Styles = (BASISDIRECTORY);
End
#endif
Directory gid_Dir_Program
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Brand_Dir_BasisLink;
#else
- ParentID = gid_Dir_Ooo_Basis;
+ ParentID = gid_Brand_Dir_Program;
+// ParentID = gid_Dir_Ooo_Basis;
#endif
- DosName = "program";
+ DosName = "";
End
#if defined MACOSX
@@ -163,7 +174,7 @@ End
Directory gid_Dir_User
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Ooo_Basis;
#endif
@@ -342,7 +353,7 @@ End
Directory gid_Dir_Share
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Ooo_Basis;
#endif
@@ -1236,18 +1247,26 @@ Directory gid_Dir_Share_Fingerprint
DosName = "fingerprint";
End
+
+#ifndef MACOSX
Directory gid_Dir_Basis_Sdk
-#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
-#else
ParentID = gid_Dir_Ooo_Basis;
-#endif
DosName = "sdk";
End
+#endif
+
+//Directory gid_Dir_Basis_Sdk
+//#if defined MACOSX
+// ParentID = gid_Brand_Dir_BasisLink;
+//#else
+// ParentID = gid_Dir_Ooo_Basis;
+//#endif
+// DosName = "sdk";
+//End
Directory gid_Dir_Help
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Ooo_Basis;
#endif
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=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/file_library_ooo.scp Tue Apr 23 09:51:15 2013
@@ -1073,8 +1073,13 @@ End
#endif
#endif
+#if defined(OS2)
+STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
+STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
+#else
STD_LIB_FILE(gid_File_Lib_Mysql,mysql.uno)
STD_LIB_FILE(gid_File_Lib_Odbc,odbc.uno)
+#endif
// STD_LIB_FILE( gid_File_Lib_Ofa , ofa)
@@ -1347,6 +1352,32 @@ File gid_File_Lib_Slideshow
#endif
End
+File gid_File_Lib_PresentationMinimizer
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ #ifdef UNX
+ Name = STRING(CONCAT2(PresentationMinimizer.uno,UNXSUFFIX));
+ #elif defined OS2
+ Name = "PresentationMinimizer.dll";
+ #else
+ Name = "PresentationMinimizer.uno.dll";
+ #endif
+End
+
+File gid_File_Lib_PresenterScreen
+ TXT_FILE_BODY;
+ Styles = (PACKED);
+ Dir = SCP2_OOO_BIN_DIR;
+ #ifdef UNX
+ Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX));
+ #elif defined OS2
+ Name = "PresenterScreen.dll";
+ #else
+ Name = "PresenterScreen.uno.dll";
+ #endif
+End
+
File gid_File_Lib_Sdbc_2
TXT_FILE_BODY;
Styles = (PACKED);
Modified: openoffice/branches/ia2/main/scp2/source/ooo/file_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/file_ooo.scp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/file_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/file_ooo.scp Tue Apr 23 09:51:15 2013
@@ -1129,7 +1129,8 @@ File gid_File_Rdb_Offapi
TXT_FILE_BODY;
Dir = gid_Dir_Program;
Styles = (PACKED);
- Name = "offapi.rdb";
+ Name = "types.rdb";
+// Name = "offapi.rdb";
End
File gid_File_Rdb_TypesVba
Modified: openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/file_resource_ooo.scp Tue Apr 23 09:51:15 2013
@@ -126,3 +126,5 @@ STD_RES_FILE( gid_File_Res_T602Filter, t
STD_RES_FILE( gid_File_Res_Forui, forui )
STD_RES_FILE( gid_File_Res_For, for )
+STD_RES_FILE( gid_File_Res_PresentationMinimizer, minimizer )
+
Modified: openoffice/branches/ia2/main/scp2/source/ooo/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/makefile.mk?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/makefile.mk Tue Apr 23 09:51:15 2013
@@ -348,10 +348,12 @@ PARFILES= \
profileitem_ooo.par \
ure.par \
ure_into_ooo.par \
- ure_standalone.par \
+ ure_standalone.par \
+ common_brand.par \
common_brand.par \
common_brand_readme.par \
- ooo_brand.par
+ ooo_brand.par
+
.IF "$(GUI)"=="WNT"
PARFILES += \
Modified: openoffice/branches/ia2/main/scp2/source/ooo/module_hidden_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/module_hidden_ooo.scp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/module_hidden_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/module_hidden_ooo.scp Tue Apr 23 09:51:15 2013
@@ -338,6 +338,8 @@ Module gid_Module_Root_Files_5
gid_File_Lib_Sax_Uno,
gid_File_Lib_Fastsax_Uno,
gid_File_Lib_Slideshow,
+ gid_File_Lib_PresentationMinimizer
+ gid_File_Lib_PresenterScreen
gid_File_Lib_Recentfile,
gid_File_Lib_Scriptframe,
gid_File_Lib_Sdbc_2,
Modified: openoffice/branches/ia2/main/scp2/source/ooo/module_lang_template.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/module_lang_template.scp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/module_lang_template.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/module_lang_template.scp Tue Apr 23 09:51:15 2013
@@ -102,7 +102,8 @@ Module gid_Module_Langpack_Resource_Temp
gid_File_Res_Tfu,
gid_File_Res_Eps,
gid_File_Res_UpdChk,
- gid_File_Res_Upd);
+ gid_File_Res_Upd,
+ gid_File_Res_PresentationMinimizer);
End
Module gid_Module_Langpack_Help_Template
Modified: openoffice/branches/ia2/main/scp2/source/ooo/ooo_brand.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/ooo_brand.scp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/ooo_brand.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/ooo_brand.scp Tue Apr 23 09:51:15 2013
@@ -53,12 +53,12 @@ File gid_File_Txt_License_Root
Styles = (PACKED);
End
-File gid_Brand_File_ServicesRdb
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
- Name = "/ooo/services.rdb";
- Styles = (PACKED);
-End
+//File gid_Brand_File_ServicesRdb
+// TXT_FILE_BODY;
+// Dir = gid_Brand_Dir_Program;
+// Name = "/ooo/services.rdb";
+// Styles = (PACKED);
+//End
ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
ProfileID = gid_Brand_Profile_Bootstrap_Ini;
Modified: openoffice/branches/ia2/main/scp2/source/ooo/profile_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/profile_ooo.scp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/profile_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/profile_ooo.scp Tue Apr 23 09:51:15 2013
@@ -43,6 +43,7 @@ End
Profile gid_Profile_Fundamentalbasis_Ini
ModuleID = gid_Module_Root;
- Name = PROFILENAME(fundamentalbasis);
+ Name = PROFILENAME(fundamental);
+// Name = PROFILENAME(fundamentalbasis);
Dir = gid_Dir_Program;
End
Modified: openoffice/branches/ia2/main/scp2/source/ooo/profileitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/profileitem_ooo.scp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/profileitem_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/profileitem_ooo.scp Tue Apr 23 09:51:15 2013
@@ -169,93 +169,137 @@ End
#endif
-ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions
+ProfileItem gid_Profileitem_Uno_Ure_Internal_Lib_Dir
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
Order = 1;
- Key = "BUNDLED_EXTENSIONS";
- Value = "$BRAND_BASE_DIR/share/extensions";
+ Key = "URE_INTERNAL_LIB_DIR";
+ Value = "${ORIGIN}";
End
-ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
+ProfileItem gid_Profileitem_Uno_Ure_Internal_Java_Dir
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
- Key = "BUNDLED_EXTENSIONS_USER";
- Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
+ Order = 2;
+ Key = "URE_INTERNAL_JAVA_DIR";
+ Value = "${ORIGIN}/classes";
+End
+
+ProfileItem gid_Profileitem_Uno_Ure_Internal_Java_Classpath
+ ProfileID = gid_Profile_Uno_Ini;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Order = 3;
+ Key = "URE_INTERNAL_JAVA_CLASSPATH";
+ Value = "${URE_MORE_JAVA_TYPES}";
+End
+
+ProfileItem gid_Profileitem_Uno_Uno_Types
+ ProfileID = gid_Profile_Uno_Ini;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Order = 4;
+ Key = "UNO_TYPES";
+ Value = "${ORIGIN}/types.rdb ${URE_MORE_TYPES}";
+End
+
+ProfileItem gid_Profileitem_Uno_Uno_Services
+ ProfileID = gid_Profile_Uno_Ini;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Order = 5;
+ Key = "UNO_SERVICES";
+ Value = "${ORIGIN}/services.rdb ${URE_MORE_SERVICES}";
+End
+
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions
+ ProfileID = gid_Profile_Uno_Ini;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Order = 6;
+ Key = "BUNDLED_EXTENSIONS";
+ Value = "$OOO_BASE_DIR/share/extensions";
End
ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_Prereg
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
+ Order = 7;
Key = "BUNDLED_EXTENSIONS_PREREG";
- Value = "$BRAND_BASE_DIR/share/prereg/bundled";
+ Value = "$OOO_BASE_DIR/share/prereg/bundled";
End
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User
+ ProfileID = gid_Profile_Uno_Ini;
+ ModuleID = gid_Module_Root;
+ Section = "Bootstrap";
+ Order = 8;
+ Key = "BUNDLED_EXTENSIONS_USER";
+ Value = "${$OOO_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled";
+End
ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
+ Order = 9;
Key = "UNO_SHARED_PACKAGES";
- Value = "$BRAND_BASE_DIR/share/uno_packages";
+ Value = "$OOO_BASE_DIR/share/uno_packages";
End
ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages_Cache
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 2;
+ Order = 10;
Key = "UNO_SHARED_PACKAGES_CACHE";
Value = "$UNO_SHARED_PACKAGES/cache";
End
-ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User
+ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
- Key = "SHARED_EXTENSIONS_USER";
- Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
+ Order = 11;
+ Key = "TMP_EXTENSIONS";
+ Value = "${$OOO_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
End
-ProfileItem gid_Profileitem_Uno_Uno_User_Packages
+ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 3;
- Key = "UNO_USER_PACKAGES";
- Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
+ Order = 12;
+ Key = "SHARED_EXTENSIONS_USER";
+ Value = "${$OOO_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared";
End
-ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions
+ProfileItem gid_Profileitem_Uno_Uno_User_Packages
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
- Key = "TMP_EXTENSIONS";
- Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp";
+ Order = 13;
+ Key = "UNO_USER_PACKAGES";
+ Value = "${$OOO_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages";
End
ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 1;
+ Order = 14;
Key = "BAK_EXTENSIONS";
- Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak";
+ Value = "${$OOO_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak";
End
ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 4;
+ Order = 15;
Key = "UNO_USER_PACKAGES_CACHE";
Value = "$UNO_USER_PACKAGES/cache";
End
@@ -263,7 +307,7 @@ ProfileItem gid_Profileitem_Uno_Pkg_Bund
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 5;
+ Order = 16;
Key = "PKG_BundledUnoFile";
Value = "$BUNDLED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
End
@@ -272,7 +316,7 @@ ProfileItem gid_Profileitem_Uno_Pkg_Shar
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 5;
+ Order = 17;
Key = "PKG_SharedUnoFile";
Value = "$SHARED_EXTENSIONS_USER/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
End
@@ -281,11 +325,30 @@ ProfileItem gid_Profileitem_Uno_Pkg_User
ProfileID = gid_Profile_Uno_Ini;
ModuleID = gid_Module_Root;
Section = "Bootstrap";
- Order = 6;
+ Order = 18;
Key = "PKG_UserUnoFile";
Value = "$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
End
+#ifdef JSC
+// JSC, will be removed soon
+ProfileItem gid_Profileitem_Fundamentalbasis_Brand_Base_Dir
+ ModuleID = gid_Module_Root;
+ ProfileID = gid_Profile_Fundamentalbasis_Ini;
+ Section = "Bootstrap";
+ Key = "BRAND_BASE_DIR";
+ Value = "${ORIGIN}/..";
+End
+#endif
+
+ProfileItem gid_Profileitem_Fundamentalbasis_Ooo_Base_Dir
+ ModuleID = gid_Module_Root;
+ ProfileID = gid_Profile_Fundamentalbasis_Ini;
+ Section = "Bootstrap";
+ Key = "OOO_BASE_DIR";
+ Value = "${ORIGIN}/..";
+End
+
ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions
ModuleID = gid_Module_Root;
ProfileID = gid_Profile_Fundamentalbasis_Ini;
@@ -355,7 +418,7 @@ ProfileItem gid_Profileitem_Fundamentalb
ProfileID = gid_Profile_Fundamentalbasis_Ini;
Section = "Bootstrap";
Key = "URE_MORE_TYPES";
- Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
+ Value = "$ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
End
ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services
@@ -363,7 +426,7 @@ ProfileItem gid_Profileitem_Fundamentalb
ProfileID = gid_Profile_Fundamentalbasis_Ini;
Section = "Bootstrap";
Key = "URE_MORE_SERVICES";
- Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb";
+ Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES}";
End
ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types
@@ -379,7 +442,7 @@ ProfileItem gid_Profileitem_Fundamentalb
ProfileID = gid_Profile_Fundamentalbasis_Ini;
Section = "Bootstrap";
Key = "URE_OVERRIDE_JAVA_JFW_SHARED_DATA";
- Value = "${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml";
+ Value = "${OOO_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml";
End
ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_User_Data
@@ -387,7 +450,7 @@ ProfileItem gid_Profileitem_Fundamentalb
ProfileID = gid_Profile_Fundamentalbasis_Ini;
Section = "Bootstrap";
Key = "URE_OVERRIDE_JAVA_JFW_USER_DATA";
- Value = "${${BRAND_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
+ Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
End
ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Classpath_Urls
@@ -413,9 +476,11 @@ ProfileItem gid_Profileitem_Fundamentalb
Section = "Bootstrap";
Key = "URE_BIN_DIR";
#if defined(WNT) || defined(OS2)
- Value = "${.link:$ORIGIN/../ure-link}/bin";
+ Value = "$ORIGIN";
+// Value = "${.link:$ORIGIN/../ure-link}/bin";
#else
- Value = "$ORIGIN/../ure-link/bin";
+ Value = "$ORIGIN";
+// Value = "$ORIGIN/../ure-link/bin";
#endif
End
@@ -425,14 +490,18 @@ ProfileItem gid_Profileitem_Fundamentalb
Section = "Bootstrap";
Key = "URE_LIB_DIR";
#if defined(WNT) || defined(OS2)
- Value = "${.link:$ORIGIN/../ure-link}/bin";
+ Value = "$ORIGIN";
+// Value = "${.link:$ORIGIN/../ure-link}/bin";
#else
- Value = "$ORIGIN/../ure-link/lib";
+ Value = "$ORIGIN";
+// Value = "$ORIGIN/../ure-link/lib";
#endif
End
// Basis layer: gid_Profile_Version_Ini_Basis
+#if defined(JSC)
+
ProfileItem gid_Basis_Profileitem_Version_Buildid
ProfileID = gid_Profile_Version_Ini_Basis;
ModuleID = gid_Module_Root;
@@ -496,3 +565,5 @@ ProfileItem gid_Basis_Profileitem_Versio
Key = "OOOPackageVersion";
Value = "${OOOPACKAGEVERSION}";
End
+
+#endif // JSC
Modified: openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.scp?rev=1470868&r1=1470867&r2=1470868&view=diff
==============================================================================
--- openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.scp (original)
+++ openoffice/branches/ia2/main/scp2/source/ooo/registryitem_ooo.scp Tue Apr 23 09:51:15 2013
@@ -247,7 +247,7 @@ End
RegistryItem gid_Regitem_Software_Openoffice_Productname_Productversion_Path
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
+ Subkey = "Software\OpenOffice\%PRODUCTNAME\%PRODUCTVERSION";
ModuleID = gid_Module_Root;
Name = "Path";
Value = "<progpath>\program\soffice.exe";
@@ -273,7 +273,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Install
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "INSTALLLOCATION";
Value = "[INSTALLLOCATION]";
@@ -318,7 +318,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Officeinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "OFFICEINSTALLLOCATION";
Value = "[INSTALLLOCATION]";
@@ -345,7 +345,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[INSTALLLOCATION]Basis\\";
@@ -354,7 +354,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "BASISINSTALLLOCATION";
Value = "[INSTALLLOCATION]Basis\\";
@@ -381,7 +381,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[INSTALLLOCATION]URE\\";
@@ -390,7 +390,7 @@ End
RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+ Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
ModuleID = gid_Module_Root;
Name = "UREINSTALLLOCATION";
Value = "[INSTALLLOCATION]URE\\";
@@ -513,14 +513,14 @@ End
RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
+ Subkey = "Software\OpenOffice\UNO\InstallPath";
ModuleID = gid_Module_Root;
Value = "<progpath>\program";
End
RegistryItem gid_Regitem_Software_Openofficeorg_Uno_Installpath_Branded
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\Apache OpenOffice\UNO\InstallPath";
+ Subkey = "Software\OpenOffice\UNO\InstallPath";
ModuleID = gid_Module_Root;
Name = "%PRODUCTNAME %PRODUCTVERSION";
Value = "<progpath>\program";