cui/source/options/optaboutconfig.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit d6922c0c193eda5245f7088456973878d635f8a1 Author: Efe Gürkan YALAMAN <efeyala...@gmail.com> Date: Wed Jul 24 02:00:05 2013 +0300 Tabpage doesn't crash on load and traverses configurations Tabpage now works without crashing. It also traverses configurations. Traversed configurations doesn't display yet. But traversal can be seen when debugging. Root of the traversal should be given as a until "/" part. For example "org.openoffice" not accepted. But "org.openoffice.Office.Canvas" accepted. Change-Id: I2d3026781bfaafa0f721b317249c8879f103bd05 diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index b7072c3..0b9eb61 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -89,7 +89,7 @@ void CuiAboutConfigTabPage::Reset( const SfxItemSet& ) Reference< XNameAccess > xConfigAccess = getConfigAccess(); - FillItems( xConfigAccess, OUString("org.openoffice") ); + FillItems( xConfigAccess, OUString("org.openoffice.Office.Canvas") ); } void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUString sPath) @@ -102,13 +102,13 @@ void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUSt for( sal_Int16 i = 0; i < seqItems.getLength(); ++i ) { Any aNode = xHierarchicalNameAccess->getByHierarchicalName( seqItems[i] ); - Reference< XHierarchicalNameAccess >xNextHierarchicalNameAccess( aNode, uno::UNO_QUERY_THROW ); - Reference< XNameAccess > xNextNameAccess( xNextHierarchicalNameAccess, uno::UNO_QUERY_THROW ); bIsLeafNode = sal_True; try { + Reference< XHierarchicalNameAccess >xNextHierarchicalNameAccess( aNode, uno::UNO_QUERY_THROW ); + Reference< XNameAccess > xNextNameAccess( xNextHierarchicalNameAccess, uno::UNO_QUERY_THROW ); uno::Sequence < OUString > seqNext = xNextNameAccess->getElementNames(); FillItems( xNextNameAccess, sPath + OUString("/") + seqItems[i] ); bIsLeafNode = sal_False; @@ -122,7 +122,7 @@ void CuiAboutConfigTabPage::FillItems( Reference< XNameAccess >xNameAccess, OUSt { //InsertEntry( sPath, "", "", ""); //Reference< beans::Property > aProperty = xHierarchicalNameAccess->getAsProperty();//getPropertyValue( seqItems[ i ] ); - //InsertEntry( sPath + OUString("/") + seqItems[ i ], OUString(""), OUString(""), xNameAccess->getPropertyValue( seqItems[ i ] ) ); + //InsertEntry( sPath + OUString("/") + seqItems[ i ], OUString(""), OUString(""), xHierarchicalNameAccess->getByHierarchicalName( seqItems[ i ] ).Value ); } } } @@ -136,7 +136,7 @@ Reference< XNameAccess > CuiAboutConfigTabPage::getConfigAccess() beans::NamedValue aProperty; aProperty.Name = "nodepath"; - aProperty.Value = uno::makeAny( OUString("org.openoffice") ); + aProperty.Value = uno::makeAny( OUString("org.openoffice.Office.Canvas") ); uno::Sequence< uno::Any > aArgumentList( 1 ); aArgumentList[0] = uno::makeAny( aProperty );
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits