accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx | 18 +++++----- solenv/bin/mkdocs.sh | 7 +-- 2 files changed, 12 insertions(+), 13 deletions(-)
New commits: commit e16a07f70ac622a01e759f2a3a5be3b9e02e30ae Author: Chris Sherlock <[email protected]> Date: Fri Feb 5 19:37:05 2016 +1100 solenv: fix mkdocs.sh to take into account projects with no inc dir Change-Id: I959279c11f0ae5f372936ee3db605716cab37c21 diff --git a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx index 9593977..f890904 100644 --- a/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/accessibility/extended/AccessibleBrowseBox.hxx @@ -50,7 +50,7 @@ protected: /** sets the XAccessible which created the context - <p>To be called only once, and only if in the ctor NULL was passed.</p> + To be called only once, and only if in the ctor NULL was passed. */ void setCreator( const css::uno::Reference< css::accessibility::XAccessible >& _rxCreator @@ -61,7 +61,7 @@ protected: virtual void SAL_CALL disposing() override; protected: - // XAccessibleContext ----------------------------------------------------- + // XAccessibleContext /** @return The count of visible children. */ virtual sal_Int32 SAL_CALL getAccessibleChildCount() @@ -74,7 +74,7 @@ protected: throw ( css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception ) override; - // XAccessibleComponent --------------------------------------------------- + // XAccessibleComponent /** @return The accessible child rendered under the given point. @@ -88,7 +88,7 @@ protected: virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override; - // XServiceInfo ----------------------------------------------------------- + // XServiceInfo /** @return The name of this class. @@ -144,7 +144,7 @@ public: } protected: - // internal virtual methods ----------------------------------------------- + // internal virtual methods /** @attention This method requires locked mutex's and a living object. @return The bounding box (VCL rect.) relative to the parent window. */ @@ -153,7 +153,7 @@ protected: @return The bounding box (VCL rect.) in screen coordinates. */ virtual Rectangle implGetBoundingBoxOnScreen() override; - // internal helper methods ------------------------------------------------ + // internal helper methods /** This method creates (once) and returns the accessible data table child. @attention This method requires locked mutex's and a living object. @@ -181,15 +181,15 @@ protected: virtual AccessibleBrowseBoxTable* createAccessibleTable(); private: - // members ---------------------------------------------------------------- + // members std::unique_ptr< AccessibleBrowseBoxImpl > m_xImpl; }; /** the XAccessible which creates/returns an AccessibleBrowseBox - <p>The instance holds its XAccessibleContext with a hard reference, while - the context holds this instance weak.</p> + The instance holds its XAccessibleContext with a hard reference, while + the context holds this instance weak. */ class AccessibleBrowseBoxAccess: public cppu::WeakImplHelper<css::accessibility::XAccessible>, diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh index 54741fe..4efc5ba 100755 --- a/solenv/bin/mkdocs.sh +++ b/solenv/bin/mkdocs.sh @@ -119,6 +119,7 @@ if [ -z "$INPUT_PROJECTS" ]; then INPUT_PROJECTS="`ls */Module_*.mk | sed 's#/.*##'`" fi + # output directory for generated documentation BASE_OUTPUT="$1" mkdir -p "$BASE_OUTPUT" || { @@ -163,16 +164,14 @@ do # project header files can be in $PROJECT/inc and/pr include/$PROJECT if [ -d "$PROJECT/inc" ]; then PROJECT_INCLUDE="$PROJECT/inc" + else + PROJECT_INCLUDE="" fi if [ -d "include/$PROJECT" ]; then PROJECT_INCLUDE="$PROJECT_INCLUDE include/$PROJECT" fi - if [ "$PROJECT" == "vcl" ]; then - PROJECT_INCLUDE="$PROJECT_INCLUDE $PROJECT/source/filter/igif/ $PROJECT/source/filter/ixbm $PROJECT/source/filter/igif/ $PROJECT/source/filter/jpeg" - fi - DOXYGEN_INPUT=`printf "%s" "$PROJECT/source $PROJECT_INCLUDE"` DOXYGEN_OUTPUT="$BASE_OUTPUT/$PROJECT" _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
